This commit was manufactured by cvs2svn to create tag 'v20050413_1845'.
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 275b34c..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.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<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 862f49c..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-build.xml
-temp.folder
-wsc-axis.jar
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 93d0c2b..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/.project
+++ /dev/null
@@ -1,30 +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>
-		<project>org.eclipse.wst.ws.apache.axis</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/build.properties b/bundles/org.eclipse.jst.ws.axis.consumption.core/build.properties
deleted file mode 100644
index 645df18..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/build.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-source.wsc-axis.jar = src/
-bin.includes = wsc-axis.jar,\
-               plugin.properties,\
-               plugin.xml,\
-               readme.html
-src.includes = build.properties,\
-               plugin.properties,\
-               plugin.xml,\
-               readme.html,\
-               src/
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 6c576c3..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/plugin.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin
-   id="org.eclipse.jst.ws.axis.consumption.core"
-   version="1.0.0"
-   name="%PLUGIN_NAME"
-   provider-name="%PLUGIN_PROVIDER">
-
-   <requires>
-      <import plugin="org.apache.ant"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.wst.command.env.core"/>
-      <import plugin="org.eclipse.jst.ws"/>
-      <import plugin="org.eclipse.jst.ws.consumption"/>
-      <import plugin="org.eclipse.jst.j2ee.web"/>
-      <import plugin="org.apache.axis11"/>
-   </requires>
-
-   <runtime>
-      <library name="wsc-axis.jar">
-      	<export name="*"/>
-      </library>
-   </runtime>
-
-   <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 ac3aaba..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,176 +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.text.MessageFormat;
-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.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-
-/**
- * Commands are executable, undoable, redoable objects. Every Command has a name and a description.
- */
-
-public class AxisDeployCommand extends SimpleCommand
-{
-  private 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()
-  {
-    super("org.eclipse.jst.ws.internal.axis.consumption.core.command.AxisDeployCommand", "org.eclipse.jst.ws.internal.axis.consumption.core.command.AxisDeployCommand");
-  }
-
-  public Status execute(Environment environment)
-  {
-    if (javaWSDLParam == null)
-    {
-      return new SimpleStatus("Java2WSDLCommand", //$NON-NLS-1$
-      getMessage("MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET"), Status.ERROR);
-    }
-
-    if (javaWSDLParam.getProjectURL() == null || javaWSDLParam.getProjectURL().equals(""))
-    { //$NON-NLS-1$
-      return new SimpleStatus("Java2WSDLCommand", //$NON-NLS-1$
-      getMessage("MSG_ERROR_PROJECT_URL_PARAM_NOT_SET"), Status.ERROR);
-    }
-
-    if (javaWSDLParam.getDeploymentFiles() == null || javaWSDLParam.getDeploymentFiles().length == 0)
-    {
-      return new SimpleStatus("Java2WSDLCommand", //$NON-NLS-1$
-      getMessage("MSG_ERROR_DEPLOY_FILE_PARAM_NOT_SET"), Status.ERROR);
-    }
-
-    environment.getProgressMonitor().report(getMessage("MSG_AXIS_DEPLOY"));
-
-    Status status = executeAntTask();
-    if (status.getSeverity() == Status.ERROR)
-    {
-    	environment.getStatusHandler().reportError(status);
-    }
-    
-    return status;
-  }
-
-  protected Status executeAntTask()
-  {
-    final class DeployTask extends AdminClientTask
-    {
-      public DeployTask()
-      {
-        project = new Project();
-        project.init();
-        taskType = "axis"; //$NON-NLS-1$
-        taskName = "axis-admin"; //$NON-NLS-1$
-        target = 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();
-      }
-      
-      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);
-
-  }
-
-  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);
-  }
-
-  /**
-   * @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 680d3de..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,201 +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.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.Log;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-
-
-/**
- * Commands are executable, undoable, redoable objects.
- * Every Command has a name and a description.
- */
-
-public class Java2WSDLCommand extends SimpleCommand {
-
-	private JavaWSDLParameter javaWSDLParam_;
-	private ResourceBundle resource = ResourceBundle.getBundle("org.eclipse.jst.ws.axis.consumption.core.consumption"); //$NON-NLS-1$
-	
-	private String LABEL = "TASK_LABEL_JAVA_WSDL_COMMAND";
-	private String DESCRIPTION = "TASK_DESC_JAVA_WSDL_COMMAND";
-
-	public Java2WSDLCommand() {
-		super();
-	    setName (getMessage(LABEL));
-		setDescription(getMessage(DESCRIPTION));
-	}	
-	/**
-	 * Constructor for Java2WSDLCommand.
-	 */
-	public Java2WSDLCommand(JavaWSDLParameter javaWSDLParam) {
-		super();
-	    setName (getMessage(LABEL));
-		setDescription(getMessage(DESCRIPTION));
-		this.javaWSDLParam_ = javaWSDLParam;
-	}
-
-	public Status execute(Environment environment) {
-		Status status;
-		if (javaWSDLParam_ == null) {
-			status = new SimpleStatus("Java2WSDLCommand", //$NON-NLS-1$
-			getMessage("MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET"), Status.ERROR);
-			environment.getStatusHandler().reportError(status);
-			return status;
-		}
-
-		if (javaWSDLParam_.getBeanName() == null) {
-			status = new SimpleStatus("Java2WSDLCommand", //$NON-NLS-1$
-			getMessage("MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET"), Status.ERROR);
-			environment.getStatusHandler().reportError(status);
-			return status;
-		}
-
-		environment.getProgressMonitor().report(
-			getMessage("MSG_GENERATE_WSDL", javaWSDLParam_.getBeanName() ) );
-
-		return executeAntTask(environment);
-	}
-
-	protected Status executeAntTask(Environment environment) {
-
-		final class Emitter extends Java2WsdlAntTask {
-			public Emitter() {
-				project = new Project();
-				project.init();
-				taskType = "axis"; //$NON-NLS-1$
-				taskName = "axis-java2wsdl"; //$NON-NLS-1$
-				target = new Target();
-			}
-		}
-
-		Emitter emitter = new Emitter();
-		emitter.createClasspath().setPath(javaWSDLParam_.getClasspath());
-		environment.getLog().log(Log.INFO, 5008, this, "executeAntTask", "Class Path = "+ javaWSDLParam_.getClasspath());
-		
-		emitter.setPortTypeName(javaWSDLParam_.getPortTypeName());
-		environment.getLog().log(Log.INFO, 5009, this, "executeAntTask", "Port Type Name = "+ javaWSDLParam_.getPortTypeName());
-		
-		emitter.setServiceElementName(javaWSDLParam_.getServiceName());
-		environment.getLog().log(Log.INFO, 5010, this, "executeAntTask", "Service Name = "+ javaWSDLParam_.getServiceName());
-		
-		emitter.setLocation(javaWSDLParam_.getUrlLocation());
-		environment.getLog().log(Log.INFO, 5011, this, "executeAntTask", "URL Location = "+ javaWSDLParam_.getUrlLocation());
-		
-		emitter.setMethods(javaWSDLParam_.getMethodString());
-		environment.getLog().log(Log.INFO, 5012, this, "executeAntTask", "Methods = "+ javaWSDLParam_.getMethodString());
-		
-		emitter.setStyle(javaWSDLParam_.getStyle());
-		environment.getLog().log(Log.INFO, 5013, this, "executeAntTask", "Style = "+ javaWSDLParam_.getStyle());
-		
-		emitter.setUse(javaWSDLParam_.getUse());
-		environment.getLog().log(Log.INFO, 5014, this, "executeAntTask", "Use = "+ javaWSDLParam_.getUse());
-		
-		emitter.setOutput(new File(javaWSDLParam_.getOutputWsdlLocation()));
-		environment.getLog().log(Log.INFO, 5015, this, "executeAntTask", "WSDL Location = "+ javaWSDLParam_.getOutputWsdlLocation());
-		
-		emitter.setNamespace(javaWSDLParam_.getNamespace());
-		environment.getLog().log(Log.INFO, 5016, this, "executeAntTask", "Name Space = "+ javaWSDLParam_.getNamespace());
-		
-		emitter.setClassName(javaWSDLParam_.getBeanName());
-		environment.getLog().log(Log.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(Log.ERROR, 5018, this, "executeAntTask", e);
-			Status status = new SimpleStatus("Java2WSDLCommand", //$NON-NLS-1$
-			getMessage("MSG_ERROR_JAVA_WSDL_GENERATE") + " " //$NON-NLS-1$
-			+e.getCause().toString(), Status.ERROR);
-			environment.getStatusHandler().reportError(status);
-			return status;
-		}
-		return new SimpleStatus( "" );
-
-	}
-	
-	public Status undo(Environment environment) {
-		return null;
-	}
-
-	public Status redo(Environment 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 d2b5265..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.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.Log;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-
-
-public class WSDL2JavaCommand extends SimpleCommand {
-
-	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$
-	private String LABEL = "TASK_LABEL_WSDL_JAVA_COMMAND";
-	private String DESCRIPTION = "TASK_DESC_WSDL_JAVA_COMMAND";
-	
-
-	public WSDL2JavaCommand() {
-		super();
-		setName(getMessage(LABEL));
-		setDescription(getMessage(DESCRIPTION));
-	}
-
-	public Status execute(Environment environment) {
-		Status status;
-		if (javaWSDLParam == null) {
-			status = new SimpleStatus("WSDL2JavaCommand", //$NON-NLS-1$
-					getMessage("MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET"), Status.ERROR);
-			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(Log.INFO, 5019, this, "execute", "Java output = " + javaWSDLParam.getJavaOutput());
-		if (javaWSDLParam.getHTTPPassword() != null) {
-			wsdl2Java.setPassword(javaWSDLParam.getHTTPPassword());
-			environment.getLog().log(Log.INFO, 5081, this, "execute", "password: " + javaWSDLParam.getHTTPPassword());
-		}
-		if (javaWSDLParam.getHTTPUsername() != null) {
-			wsdl2Java.setUsername(javaWSDLParam.getHTTPUsername());
-			environment.getLog().log(Log.INFO, 5082, this, "execute", "username: " + javaWSDLParam.getHTTPUsername());
-		}
-		environment.getLog().log(Log.INFO, 5020, this, "execute", "WSDL Location = " + javaWSDLParam.getInputWsdlLocation());
-		environment.getProgressMonitor().report(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(Log.ERROR, 5021, this, "execute", e);
-			status = new SimpleStatus("Java2WSDLCommand", //$NON-NLS-1$
-					getMessage("MSG_ERROR_WSDL_JAVA_GENERATE") + " " //$NON-NLS-1$
-							+ e.toString(), Status.ERROR);
-			environment.getStatusHandler().reportError(status);
-			return status;
-		}
-		return new SimpleStatus("");
-	}
-
-	/*
-	 * 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(Environment environment) {
-		return null;
-	}
-
-	public Status redo(Environment 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.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/wsfinder/WSFinderAxis.java b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/wsfinder/WSFinderAxis.java
deleted file mode 100644
index 84cd5f4..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/wsfinder/WSFinderAxis.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.jst.ws.internal.axis.consumption.core.wsfinder;
-
-import java.util.List;
-import java.util.Vector;
-
-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.runtime.CoreException;
-import org.eclipse.jst.j2ee.internal.web.operations.J2EEWebNatureRuntime;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.wsfinder.LiveWSDLFilter;
-import org.eclipse.jst.ws.internal.consumption.wsfinder.WSFinderCommon;
-
-public class WSFinderAxis extends WSFinderCommon
-{
-  public WSFinderAxis()
-  {
-    super();
-  }
-
-  public List find()
-  {
-    final Vector wsdlURLs = new Vector();
-    IProject[] projects = getWorkspaceProjects();
-    for (int i = 0; i < projects.length; i++)
-    {
-      J2EEWebNatureRuntime webNature = getWebNature(projects[i]);
-      if (webNature != null)
-      {
-        final String webProjectURL = ResourceUtils.getWebProjectURL(projects[i]);
-        if (webProjectURL != null && webProjectURL.length() > 0)
-        {
-          final IFolder folderWSDL = getFolderRootPublishable(webNature).getFolder("wsdl");
-          try
-          {
-            folderWSDL.accept(
-              new IResourceVisitor()
-              {
-                public boolean visit(IResource resource)
-                {
-                  if (resource.getType() == IResource.FILE)
-                  {
-                    String ext = resource.getFileExtension();
-                    if (ext != null && ext.equalsIgnoreCase("wsdl"))
-                    {
-                      String resPath = resource.getFullPath().toString();
-                      String folderPath = folderWSDL.getFullPath().toString();
-                      int index = resPath.indexOf(folderPath);
-                      if (index != -1)
-                        resPath = resPath.substring(index+folderPath.length(), resPath.length());
-                      StringBuffer sb = new StringBuffer(webProjectURL);
-                      sb.append("/wsdl");
-                      sb.append(resPath);
-                      wsdlURLs.add(sb.toString());
-                    }
-                  }
-                  return true;
-                }
-              }
-            );
-          }
-          catch (CoreException ce)
-          {
-          }
-        }
-      }
-    }
-    LiveWSDLFilter[] filters = new LiveWSDLFilter[wsdlURLs.size()];
-    for (int i = 0; i < filters.length; i++)
-    {
-      filters[i] = new LiveWSDLFilter((String)wsdlURLs.get(i));
-      filters[i].start();
-    }
-    for (int i = 0; i < filters.length; i++)
-    {
-      if (!filters[i].isFinish())
-      {
-        Thread.yield();
-        i = -1;
-      }
-    }
-    for (int i = 0; i < filters.length; i++)
-    {
-      if (!filters[i].isWSDLLive())
-        wsdlURLs.remove(filters[i].getWSDLURL());
-    }
-    return wsdlURLs;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/.classpath b/bundles/org.eclipse.jst.ws.axis.consumption.ui/.classpath
deleted file mode 100644
index 275b34c..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.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.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/.cvsignore b/bundles/org.eclipse.jst.ws.axis.consumption.ui/.cvsignore
deleted file mode 100644
index a21e9e0..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-build.xml
-temp.folder
-wsc-axis-ui.jar
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/.project b/bundles/org.eclipse.jst.ws.axis.consumption.ui/.project
deleted file mode 100644
index cb0ee10..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/.project
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.ws.axis.consumption.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.axis.consumption.core</project>
-		<project>org.eclipse.jst.ws.consumption</project>
-		<project>org.eclipse.jst.ws.consumption.ui</project>
-		<project>org.eclipse.jst.ws.discovery.core</project>
-		<project>org.eclipse.jst.ws.ui</project>
-		<project>org.eclipse.wst.wsdl</project>
-		<project>org.eclipse.wst.ws.parser</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.ui/build.properties b/bundles/org.eclipse.jst.ws.axis.consumption.ui/build.properties
deleted file mode 100644
index 3df487d..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-source.wsc-axis-ui.jar = src/
-bin.includes = wsc-axis-ui.jar,\
-               plugin.properties,\
-               plugin.xml
-src.includes = build.properties,\
-               plugin.properties,\
-               plugin.xml,\
-               src/
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/plugin.properties b/bundles/org.eclipse.jst.ws.axis.consumption.ui/plugin.properties
deleted file mode 100644
index cb7a83d..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/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=Webservice Axis Consumption UI
-PLUGIN_PROVIDER=Eclipse.org
-
-WEBSERVICECLIENTTYPE_NAME_JAVA_AXIS=Java proxy
-LABEL_RUNTIME_AXIS_11=Apache Axis 1.1
-DESC_RUNTIME_AXIS_11=Apache Axis 1.1
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/plugin.xml b/bundles/org.eclipse.jst.ws.axis.consumption.ui/plugin.xml
deleted file mode 100644
index b24eefa..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/plugin.xml
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin
-   id="org.eclipse.jst.ws.axis.consumption.ui"
-   version="1.0.0"
-   name="%PLUGIN_NAME"
-   provider-name="%PLUGIN_PROVIDER"
-   class="org.eclipse.jst.ws.internal.axis.consumption.ui.plugin.WebServiceAxisConsumptionUIPlugin">
-
-   <runtime>
-      <library name="wsc-axis-ui.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-
-   <requires>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.emf.common"/>
-      <import plugin="org.eclipse.emf.ecore"/>
-      <import plugin="org.eclipse.jdt.core"/>
-      <import plugin="org.eclipse.jem"/>
-      <import plugin="org.eclipse.jem.util"/>
-      <import plugin="org.eclipse.jem.workbench"/>
-      <import plugin="org.eclipse.wst.ws.parser"/>
-      <import plugin="org.eclipse.jst.ws.consumption.ui"/>
-      <import plugin="org.eclipse.jst.ws"/>
-      <import plugin="org.eclipse.jst.ws.axis.consumption.core"/>
-      <import plugin="org.eclipse.jst.ws.ui"/>
-      <import plugin="org.eclipse.jst.ws.consumption"/>
-      <import plugin="org.eclipse.core.runtime.compatibility"/>
-      <import plugin="org.eclipse.wst.command.env.core"/>
-      <import plugin="org.eclipse.wst.command.env"/>
-      <import plugin="org.eclipse.wst.command.env.ui"/>
-      <import plugin="org.eclipse.wst.server.core"/>
-      <import plugin="org.eclipse.wst.wsdl"/>
-      <import plugin="org.eclipse.jst.j2ee"/>
-      <import plugin="org.eclipse.jst.j2ee.web"/>
-      <import plugin="org.eclipse.wst.common.emfworkbench.integration"/>
-      <import plugin="org.eclipse.jem.workbench"/>
-      <import plugin="org.eclipse.wst.web"/>
-      <import plugin="org.eclipse.wst.ws"/>
-      <import plugin="org.eclipse.wst.common.modulecore"/>
-      <import plugin="org.wsdl4j"/>
-      <import plugin="org.apache.axis11"/>
-   </requires>
-
-   <!-- Web Service Client Types -->
-
-   <extension
-         point="org.eclipse.jst.ws.consumption.ui.webServiceClientType">
-
-      <webServiceServer
-            factoryId="org.eclipse.jst.server.tomcat.32"
-            isDefault="false"
-            runtimeTypeIds="org.eclipse.jst.server.tomcat.32.runtime"
-            id="SERVER_ID_TOMCAT32_LOCAL">
-      </webServiceServer>
-
-      <webServiceServer
-            factoryId="org.eclipse.jst.server.tomcat.40"
-            isDefault="false"
-            runtimeTypeIds="org.eclipse.jst.server.tomcat.40.runtime"
-            id="SERVER_ID_TOMCAT40_LOCAL">
-      </webServiceServer>
-
-      <webServiceServer
-            factoryId="org.eclipse.jst.server.tomcat.41"
-            isDefault="false"
-            runtimeTypeIds="org.eclipse.jst.server.tomcat.41.runtime"
-            id="SERVER_ID_TOMCAT41_LOCAL">
-      </webServiceServer>
-
-      <webServiceServer
-            factoryId="org.eclipse.jst.server.tomcat.50"
-            isDefault="false"
-            runtimeTypeIds="org.eclipse.jst.server.tomcat.50.runtime"
-            id="SERVER_ID_TOMCAT50_LOCAL">
-      </webServiceServer>
-
-      <webServiceRuntime
-            label="%LABEL_RUNTIME_AXIS_11"
-            description="%DESC_RUNTIME_AXIS_11"
-            isDefault="false"
-            j2eeversion="13 14"
-            id="org.eclipse.jst.ws.runtime.axis11">
-      </webServiceRuntime>
-
-      <webServiceClientType
-            name="%WEBSERVICECLIENTTYPE_NAME_JAVA_AXIS"
-            runtime="org.eclipse.jst.ws.runtime.axis11"
-            clientType="org.eclipse.jst.ws.client.type.java"
-            assemblyBinding="org.eclipse.jst.ws.internal.axis.consumption.ui.wizard.client.WebServiceClientAxisType"
-            server="SERVER_ID_TOMCAT32_LOCAL"
-            id="org.eclipse.jst.ws.internal.axis.consumption.ui.wizard.client.WebServiceClientAxisType.axis11.Tomcat32Local">
-      </webServiceClientType>
-
-      <webServiceClientType
-            name="%WEBSERVICECLIENTTYPE_NAME_JAVA_AXIS"
-            runtime="org.eclipse.jst.ws.runtime.axis11"
-            clientType="org.eclipse.jst.ws.client.type.java"
-            assemblyBinding="org.eclipse.jst.ws.internal.axis.consumption.ui.wizard.client.WebServiceClientAxisType"
-            server="SERVER_ID_TOMCAT40_LOCAL"
-            id="org.eclipse.jst.ws.internal.axis.consumption.ui.wizard.client.WebServiceClientAxisType.axis11.Tomcat40Local">
-      </webServiceClientType>
-
-      <webServiceClientType
-            name="%WEBSERVICECLIENTTYPE_NAME_JAVA_AXIS"
-            runtime="org.eclipse.jst.ws.runtime.axis11"
-            clientType="org.eclipse.jst.ws.client.type.java"
-            assemblyBinding="org.eclipse.jst.ws.internal.axis.consumption.ui.wizard.client.WebServiceClientAxisType"
-            server="SERVER_ID_TOMCAT41_LOCAL"
-            id="org.eclipse.jst.ws.internal.axis.consumption.ui.wizard.client.WebServiceClientAxisType.axis11.Tomcat41Local">
-      </webServiceClientType>
-
-      <webServiceClientType
-            name="%WEBSERVICECLIENTTYPE_NAME_JAVA_AXIS"
-            runtime="org.eclipse.jst.ws.runtime.axis11"
-            clientType="org.eclipse.jst.ws.client.type.java"
-            assemblyBinding="org.eclipse.jst.ws.internal.axis.consumption.ui.wizard.client.WebServiceClientAxisType"
-            server="SERVER_ID_TOMCAT50_LOCAL"
-            id="org.eclipse.jst.ws.internal.axis.consumption.ui.wizard.client.WebServiceClientAxisType.axis11.Tomcat50Local">
-      </webServiceClientType>
-
-   </extension>
-
-   <!-- J2EE Service Reference Generator -->
-      
-   <extension
-         point="org.eclipse.jst.j2ee.WebServiceClientGenerator">
-     <generator
-           className="org.eclipse.jst.ws.internal.axis.consumption.ui.command.AxisClientGenerator">
-        <runtime
-              serverTarget="Generic J2EE Container">
-        </runtime>         
-     </generator>
-   </extension>
-   
-	<extension point="org.eclipse.wst.command.env.ui.widgetRegistry">
-       <widgetFactory   
-             id="AxisClientConfig"
-             insertBeforeCommandId="org.eclipse.jst.ws.internal.axis.consumption.ui.task.DefaultsForHTTPBasicAuthCommand"
-             class="org.eclipse.jst.ws.internal.axis.consumption.wsrt.AxisClientConfigWidgetFactory"/>
-    </extension> 
-
-</plugin>
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/axis/consumption/ui/plugin.properties b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/axis/consumption/ui/plugin.properties
deleted file mode 100644
index 5a9b0bb..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/axis/consumption/ui/plugin.properties
+++ /dev/null
@@ -1,118 +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.
-#
-
-MSG_ERROR_DEFAULT_BEAN=IWAB0491E Error encountered while setting up default values for Java bean
-MSG_ERROR_READ_WSDL=IWAB0494E Error in reading WSDL file {0}
-MSG_ERROR_WSDL_NO_DEFINITION=IWAB0495E WSDL file at {0} has no definition element
-MSG_ERROR_WSDL_NO_PORT=IWAB0496E WSDL file at {0} has no port element
-MSG_ERROR_WRITE_WSDL=IWAB0497E Error in writing WSDL file {0}
-
-
-
-#
-# Messages for CopyClientWSDLTask
-#
-MSG_ERROR_IMPORT_WSDL=IWAB0531E Error in resolving WSDL file {0}, import WSDL file must have absolute URL or relative URL in the same directory
-
-
-#
-#DefaultsForClientJavaWSDLCommand
-#
-TASK_LABEL_CLIENT_JAVA_WSDL_DEFAULTS=DefaultsForClientJavaWSDL
-TASK_DESC_CLIENT_JAVA_WSDL_DEFAULTS=Builds the JavaWSDLParameter for client side.
-MSG_ERROR_WSDL_LOCATION_NOT_SET=IWAB0501E WSDL location not set.
-
-#
-#AddJarsToProjectBuildPathTask
-#
-TASK_LABEL_JARS_TO_PROJECT=AddJarsToProjectBuildPathTask
-TASK_DESC_JARS_TO_PROJECT=Add Jars to project build path.
-MSG_WARN_NO_JAVA_NATURE=IWAB0502W The project is not a Java project.
-MSG_ERROR_BAD_BUILDPATH=IWAB0503E Unable to update Java build path. Please check your system environment.
-
-#
-#CopyAxisJarCommand
-#
-TASK_DESC_COPY_JARS_TO_PROJECT=CopyAxisJarCommand
-TASK_LABEL_COPY_JARS_TO_PROJECT=Copy required Axis runtime jars from plugin to web project.
-PROGRESS_INFO_COPY_AXIS_CFG=IWAB0505I Copying Axis jar files to web project.
-MSG_ERROR_FILECOPY=IWAB0506E Error when copying Axis jar files to web project
-
-#
-#RefreshProjectTask
-#
-TASK_LABEL_REFESH_PROJECT=RefreshProjectTask
-TASK_DESC_REFESH_PROJECT=Refresh the files on the project with the local file system.
-MSG_ERROR_REFRESH_PROJECT=IWAB0508E Unable to refresh project.
-
-
-#
-#WebServiceAxisProxyFragment
-#
-
-#
-#WebServiceAxisProxyPage
-#
-TOOLTIP_PWJB_PAGE=Page
-TOOLTIP_PWJB_TEXT_FOLDER=Folder for proxy to be generated for the selected binding.
-TOOLTIP_PWJB_CHECKBOX_GENPROXY=Check to enable/disable the generation of a proxy.
-
-PAGE_TITLE_WS_AXIS_PROXY=Web Service Proxy Page
-PAGE_DESC_WS_AXIS_PROXY=Select generate proxy if you want to generate proxy for your service.
-CHECKBOX_GENPROXY=Generate proxy
-LABEL_FOLDER_NAME=Output folder
-
-#
-# CheckAxisDeploymentDescriptorsTask
-#
-CHECK_WS_DD_TASK_DESCRIPTION=CheckAxisDeploymentDescriptorsTask
-CHECK_WS_DD_TASK_LABEL=CheckAxisDeploymentDescriptorsTask
-
-#
-#ClasspathUtils
-#
-MSG_ERROR_CLASSPATH_UTILS_IOEXCEPTION=IWAB0509E IOException in ClasspathUtils
-
-#
-# Messages for WebSerivceAxisMappingsPage
-#
-PAGE_TITLE_WS_BEAN2XML=Web Service package to namespace mapping
-PAGE_TITLE_WS_XML2PROXY=Web Service Client namespace to package mapping
-PAGE_DESC_P2N_MAPPINGS=Define custom mapping for package to namespace.
-LABEL_MAPPING_PAIRS=Mapping pairs
-TABLE_COLUMN_LABEL_PACKAGE=package
-TABLE_COLUMN_LABEL_NAMESPACE=namespace
-LABEL_EXPLORE_MAPPINGS_XML2BEAN=Define custom mapping for namespace to package.
-TOOLTIP_N2P_SHOW_MAPPINGS=Define namespace to package mapping for customization.
-
-#
-# Messages for CheckAxisDeploymentDescriptorsTask
-#
-MSG_ERROR_XML_FILE_OVERWRITE_DISABLED=IWAB0532E Do you want to overwrite the Apache Axis deployment descriptor?
-
-#
-#Messages for CopyClientWSDLCommand
-#
-TASK_DESC_COPY_CLIENT_WSDL=Copies WSDL to Client project
-TASK_LABEL_COPY_CLIENT_WSDL=Copy WSDL to Client project
-
-#
-#AxisClientInputCommand and AxisClientOutputCommand
-#
-
-TASK_LABEL_AXIS_CLIENT_INPUT=Axis client input commmand
-TASK_DESC_AXIS_CLIENT_INPUT=Axis client input commmand
-TASK_LABEL_AXIS_CLIENT_OUTPUT=Axis client output commmand
-TASK_DESC_AXIS_CLIENT_OUTPUT=Axis client output commmand
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AddAxisJARToBuildPathCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AddAxisJARToBuildPathCommand.java
deleted file mode 100644
index ee71e13..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AddAxisJARToBuildPathCommand.java
+++ /dev/null
@@ -1,166 +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
- *******************************************************************************/
-/*
- * Command to add axis.jar to the build path of a project as an external variable
- */
-package org.eclipse.jst.ws.internal.axis.consumption.ui.command;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IPluginDescriptor;
-import org.eclipse.core.runtime.IPluginRegistry;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-
-
-/**
- * @author rsinha
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class AddAxisJARToBuildPathCommand extends SimpleCommand
-{
-  private String pluginId_ = "org.eclipse.jst.ws.axis.consumption.ui";
-  private MessageUtils msgUtils;
-  private String jarPluginId = "org.eclipse.wst.ws.apache.axis";
-  private String jarPluginRelPath = "lib";
-  private String jarName = "axis.jar";
-  private IProject project;
-  
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.core.Command#execute(org.eclipse.wst.command.env.core.common.Environment)
-   */
-  public Status execute(Environment environment)
-  {
-    msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
-    Status status = new SimpleStatus("");
-
-    //Add JARs to the classpath
-    IClasspathEntry[] oldClasspath;
-    IClasspathEntry[] newClasspath;
-    IJavaProject javaProject;
-    
-    //Get the old classpath
-    try
-    {    
-      javaProject = JavaCore.create(project);    
-      if (javaProject == null)
-      {
-        Status wStatus = new SimpleStatus("", msgUtils.getMessage("MSG_WARNING_NOT_COMPILE"), Status.WARNING);
-        return wStatus;
-      }
-
-      oldClasspath = javaProject.getRawClasspath();
-    }
-    catch (JavaModelException e)
-    {
-      Status wStatus = new SimpleStatus("", msgUtils.getMessage("MSG_WARNING_NOT_COMPILE"), Status.WARNING);
-      return wStatus;
-    }
-    
-    //Check if the axis.jar is already on the build path
-    boolean found = false;
-	for (int i=0; i<oldClasspath.length; i++)
-	{
-	  found = found || oldClasspath[i].getPath().toString().toLowerCase().endsWith(jarName.toLowerCase());
-    }
-
-	if (found) 
-	{
-	  return status;
-	}    
-    
-	//Add axis.jar to the build path
-	newClasspath = new IClasspathEntry[oldClasspath.length + 1];
-    int i = 0;
-    for (i=0 ; i < oldClasspath.length; i++)
-    {
-      newClasspath[i] = oldClasspath[i];
-    }
-    
-    IClasspathEntry newEntry = getClasspathEntry();
-    if (newEntry==null)
-    {
-      Status wStatus = new SimpleStatus("", msgUtils.getMessage("MSG_WARNING_NOT_COMPILE"), Status.WARNING);
-      return wStatus;
-    }
-    newClasspath[i] = newEntry;
-    
-    try
-    {
-      javaProject.setRawClasspath(newClasspath,null);
-    }
-    catch (JavaModelException e)
-    {
-      Status wStatus = new SimpleStatus("", msgUtils.getMessage("MSG_WARNING_NOT_COMPILE"), Status.WARNING);
-      return wStatus;
-    }
-    
-    
-    return status;
-    
-  }
-  
-  private IClasspathEntry getClasspathEntry()
-  {
-    try
-    {
-      IPluginRegistry pluginRegistry = Platform.getPluginRegistry();
-      IPluginDescriptor pluginDescriptor = pluginRegistry.getPluginDescriptor(jarPluginId);
-
-      StringBuffer theJar = new StringBuffer();
-      theJar.append(jarPluginRelPath);
-
-      if (jarPluginRelPath.length()>0)
-        theJar.append(IPath.SEPARATOR);
-
-      theJar.append(jarName);
-      
-      URL localURL = Platform.asLocalURL(new URL(pluginDescriptor.getInstallURL(),theJar.toString()));
-      Path jarPath =  new Path(localURL.getFile());
-      IClasspathEntry cpEntry = JavaCore.newLibraryEntry(jarPath, null, null);
-      return cpEntry;
-    }
-    catch (MalformedURLException e)
-    {
-      return null;
-    }
-    catch (IOException e)
-    {
-      return null;
-    }
-
-  }
- 
-  
-  /**
-   * @param project The project to set.
-   */
-  public void setProject(IProject project)
-  {
-    this.project = project;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientDefaultingCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientDefaultingCommand.java
deleted file mode 100644
index 47d86d4..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientDefaultingCommand.java
+++ /dev/null
@@ -1,270 +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.ui.command;
-
-import java.util.Vector;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.common.WSDLParserFactory;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.ws.parser.wsil.WebServicesParser;
-
-/**
- * 
- * AxisClientDefaultingCommand
- *  
- */
-public class AxisClientDefaultingCommand extends SimpleCommand 
-{
-    private boolean isClientScenario_  = true;
-	private boolean customizeMappings_ = false;
-	private boolean generateProxy_ = true;
-	private String clientRuntimeId_;
-	private JavaWSDLParameter javaWSDLParam_;
-	private IProject proxyProject_ = null;
-	private IProject clientProjectEAR_ = null;
-	private String wsdlURL_;
-	private boolean testProxySelected_;
-	private IServer clientExistingServer_;
-	private String clientServer_;
-	private String clientServerTypeId_;
-	private boolean clientIsExistingServer_;
-	private String proxyProjectFolder_;
-	private WebServicesParser webServicesParser_;
-	
-	
-	public AxisClientDefaultingCommand() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.command.env.core.Command#execute(org.eclipse.wst.command.env.core.common.Environment)
-	 */
-	public Status execute(Environment environment) {
-		Status status = new SimpleStatus("");
-		
-		clientExistingServer_ = getServerFromServerLabel();
-		if (clientExistingServer_ != null) {
-			clientServerTypeId_ = clientExistingServer_.getServerType().getId();
-		} else {
-			//TODO get the factory id for the type.
-		}
-		//javaWSDLParam
-		javaWSDLParam_ = new JavaWSDLParameter();
-		
-		// proxyProjectFolber_
-		
-		webServicesParser_ = WSDLParserFactory.getWSDLParser();
-		return status;
-	}
-
-	public void setClientRuntimeID(String clientRuntimeId) {
-		clientRuntimeId_ = clientRuntimeId;
-	}
-
-	public String getClientRuntimeID() {
-		return this.clientRuntimeId_;
-	}
-
-	/**
-	 * @return Returns the javaWSDLParam.
-	 */
-	public JavaWSDLParameter getJavaWSDLParam() {
-		return javaWSDLParam_;
-	}
-
-	/**
-	 * @return Returns the clientProject.
-	 */
-	public IProject getClientProject() {
-		return proxyProject_;
-	}
-
-	/**
-	 * @param clientProject
-	 *            The clientProject to set.
-	 */
-	public void setClientProject(IProject clientProject) {
-		this.proxyProject_ = clientProject;
-	}
-
-	/**
-	 * @return Returns the clientProjectEAR.
-	 */
-	public IProject getClientProjectEAR() {
-		return clientProjectEAR_;
-	}
-
-	/**
-	 * @param clientProjectEAR
-	 *            The clientProjectEAR to set.
-	 */
-	public void setClientProjectEAR(IProject clientProjectEAR) {
-		this.clientProjectEAR_ = clientProjectEAR;
-	}
-
-	/**
-	 * @return Returns the testProxySelected.
-	 */
-	public boolean getTestProxySelected() {
-		return testProxySelected_;
-	}
-
-	/**
-	 * @param testProxySelected
-	 *            The testProxySelected to set.
-	 */
-	public void setTestProxySelected(boolean testProxySelected) {
-		this.testProxySelected_ = testProxySelected;
-	}
-
-	/**
-	 * @return Returns the wsdlURL.
-	 */
-	public String getWsdlURL() {
-	  return wsdlURL_;
-	}
-
-	/**
-	 * @param wsdlURL
-	 *            The wsdlURL to set.
-	 */
-	public void setWsdlURL(String wsdlURL) {
-		this.wsdlURL_ = wsdlURL;
-	}
-
-	/**
-	 * @return Returns the clientServer.
-	 */
-	public IServer getClientExistingServer() {
-		return clientExistingServer_;
-	}
-
-	/**
-	 * @param clientServer
-	 *            The clientServer to set.
-	 */
-	public void setClientServer(String clientServer) {
-		this.clientServer_ = clientServer;
-	}
-
-	/**
-	 * @return Returns the clientIsExistingServer.
-	 */
-	public boolean isClientIsExistingServer() {
-		return clientIsExistingServer_;
-	}
-
-	/**
-	 * @param clientIsExistingServer
-	 *            The clientIsExistingServer to set.
-	 */
-	public void setClientIsExistingServer(boolean clientIsExistingServer) {
-		this.clientIsExistingServer_ = clientIsExistingServer;
-	}
-
-	public boolean getCustomizeClientMappings() {
-		return customizeMappings_;
-	}
-
-	public void setCustomizeClientMappings(boolean value) {
-		customizeMappings_ = value;
-	}
-
-	private IServer getServerFromServerLabel() {
-		if (true)
-		// rsk revisit if (clientIsExistingServer_)
-		{
-			// Maybe this should be in WebServiceServerRuntimeTypeRegistry
-			Vector serverIds = new Vector();
-			{
-				IServer[] servers = ServerCore.getServers();
-				if (servers != null && servers.length!=0) {
-					for (int i = 0; i < servers.length; i++) {
-						IServer server = (IServer) servers[i];
-						if ((server.getName()).equals(clientServer_))
-							return server;
-					}
-				}
-			}
-			//
-		} else {
-			//TODO create the server
-		}
-		return null;
-	}
-	/**
-	 * @return Returns the proxyProjectFolder.
-	 */
-	public String getProxyProjectFolder() {
-		if (proxyProject_!=null) {
-			proxyProjectFolder_ = ResourceUtils.getJavaSourceLocation(proxyProject_).toString();
-		}		
-		return proxyProjectFolder_;  
-	}
-
-	/**
-	 * @return Returns the webServicesParser.
-	 */
-	public WebServicesParser getWebServicesParser() {
-		return webServicesParser_;
-	}
-	/**
-	 * @param webServicesParser The webServicesParser to set.
-	 */
-	public void setWebServicesParser(WebServicesParser webServicesParser) {
-		this.webServicesParser_ = webServicesParser;
-	}
-	/**
-	 * @return Returns the generateProxy.
-	 */
-	public boolean getGenerateProxy() {
-		return generateProxy_;
-	}
-	/**
-	 * @param generateProxy The generateProxy to set.
-	 */
-	public void setGenerateProxy(boolean generateProxy) {
-		this.generateProxy_ = generateProxy;
-	}
-	
-    /**
-     * @return Returns the isClientScenario_.
-     */
-    public boolean getIsClientScenario()
-    {
-      return isClientScenario_;
-    }
-    
-    /**
-     * @param isClientScenario_ The isClientScenario_ to set.
-     */
-    public void setIsClientScenario(boolean isClientScenario)
-    {
-      isClientScenario_ = isClientScenario;
-    }
-    
-    /**
-     * @param setEndpointMethod The setEndpointMethod to set.
-     */
-    public String getSetEndpointMethod()
-    {
-      return "setEndpoint";
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientGenerator.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientGenerator.java
deleted file mode 100644
index 3cd8adf..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientGenerator.java
+++ /dev/null
@@ -1,328 +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.axis.consumption.ui.command;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Port;
-import javax.wsdl.PortType;
-import javax.wsdl.Service;
-import javax.wsdl.extensions.soap.SOAPAddress;
-import javax.xml.namespace.QName;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.j2ee.internal.webservices.WebServiceClientGenerator;
-import org.eclipse.jst.j2ee.internal.webservices.WebServicesClientDataHelper;
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.WSDL2JavaCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.env.J2EEEnvironment;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.AddJarsToProjectBuildPathTask;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.CopyAxisJarCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.DefaultsForHTTPBasicAuthCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.RefreshProjectCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.Stub2BeanCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.ValidateWSDLCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.util.WSDLUtils;
-import org.eclipse.jst.ws.internal.common.EnvironmentUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.common.StringToIProjectTransformer;
-import org.eclipse.jst.ws.internal.consumption.command.common.BuildProjectCommand;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.ws.parser.discovery.WebServicesParserExt;
-import org.eclipse.wst.ws.parser.wsil.WebServicesParser;
-
-/**
- * 
- */
-public class AxisClientGenerator extends WebServiceClientGenerator 
-{
-  private String pluginId_ = "org.eclipse.jst.ws.axis.consumption.ui";
-  
-  public IStatus genWebServiceClientArtifacts(WebServicesClientDataHelper dataModel)
-  {
-  	//get info from the model
-  	String wsdlURL = dataModel.getWSDLUrl();
-    String project = dataModel.getProjectName();
-    String outputWSDLFilePathName = dataModel.getOutputWSDLFileName();
-    String serviceQName = dataModel.getServiceQName();
-    boolean shouldDeploy = dataModel.shouldDeploy();
-    
-    
-    //Generate the artifacts
-    Status status = new SimpleStatus("");
-    //AxisClientDefaultingCommand
-    AxisClientDefaultingCommand axisClientDefaultingCommand = new AxisClientDefaultingCommand();
-                                                                                                axisClientDefaultingCommand.setWsdlURL(wsdlURL);
-    axisClientDefaultingCommand.setWebServicesParser(new WebServicesParserExt());
-    axisClientDefaultingCommand.setClientProject((IProject)(new StringToIProjectTransformer().transform(project)));
-    axisClientDefaultingCommand.setTestProxySelected(false);
-    axisClientDefaultingCommand.setIsClientScenario(true);
-    axisClientDefaultingCommand.setGenerateProxy(true);
-    J2EEEnvironment j2eeEnvironment = new J2EEEnvironment();
-    status = axisClientDefaultingCommand.execute(j2eeEnvironment);
-    if (status.getSeverity()!=Status.OK)
-    {
-      return EnvironmentUtils.convertStatusToIStatus(status, pluginId_);
-    }
-    
-//  Figure out if this is a Web, EJB, or AppClient project
-    boolean isWebProject = ResourceUtils.isWebProject(axisClientDefaultingCommand.getClientProject());
-    
-    //DefaultsForHTTPBasicAuthCommand
-    DefaultsForHTTPBasicAuthCommand httpCommand = new DefaultsForHTTPBasicAuthCommand();
-    httpCommand.setJavaWSDLParam(axisClientDefaultingCommand.getJavaWSDLParam());
-    httpCommand.setWsdlServiceURL(axisClientDefaultingCommand.getWsdlURL());
-    httpCommand.setWebServicesParser(axisClientDefaultingCommand.getWebServicesParser());
-    status = httpCommand.execute(j2eeEnvironment);
-    if (status.getSeverity()!=Status.OK)
-    {
-      return EnvironmentUtils.convertStatusToIStatus(status, pluginId_);
-    }
-    
-    //CopyAxisJarCommand
-    //The code generated by the Axis WSDL2Java emitter requires axis.jar in order to compile.
-    //In the case of a Web project, we add it to the lib directory.
-    //In the case of an EJB or App Client project, we add it as an external JAR. This breaks
-    //the team environment scenario. We will have to think of a better way to deal with this 
-    //in the future.
-    if (isWebProject)
-    {
-	    CopyAxisJarCommand axjCommand = new CopyAxisJarCommand();
-	    axjCommand.setProject(axisClientDefaultingCommand.getClientProject());
-	    status = axjCommand.execute(j2eeEnvironment);
-	    if (status.getSeverity()!=Status.OK)
-	    {
-	      return EnvironmentUtils.convertStatusToIStatus(status, pluginId_);
-	    }
-    }
-    else 
-    {
-      AddAxisJARToBuildPathCommand addAxisCommand = new AddAxisJARToBuildPathCommand();
-      addAxisCommand.setProject(axisClientDefaultingCommand.getClientProject());
-      status = addAxisCommand.execute(j2eeEnvironment);
-	  if (status.getSeverity() != Status.OK)
-      {
-        return EnvironmentUtils.convertStatusToIStatus(status, pluginId_);
-      }      
-    }
-    
-    //AddJarsToProjectBuildPathTask
-    AddJarsToProjectBuildPathTask addJarsCommand = new AddJarsToProjectBuildPathTask();
-    addJarsCommand.setProject(axisClientDefaultingCommand.getClientProject());
-    status = addJarsCommand.execute(j2eeEnvironment);
-    if (status.getSeverity()!=Status.OK)
-    {
-      return EnvironmentUtils.convertStatusToIStatus(status, pluginId_);
-    }    
-    
-    //DefaultsForClientJavaWSDLCommand
-    DefaultsForClientJavaWSDLCommand defClientCommand = new DefaultsForClientJavaWSDLCommand();
-    defClientCommand.setJavaWSDLParam(axisClientDefaultingCommand.getJavaWSDLParam());
-    defClientCommand.setProxyProject(axisClientDefaultingCommand.getClientProject());
-    defClientCommand.setWSDLServiceURL(axisClientDefaultingCommand.getWsdlURL());
-    status = defClientCommand.execute(j2eeEnvironment);
-    if (status.getSeverity()!=Status.OK)
-    {
-      return EnvironmentUtils.convertStatusToIStatus(status, pluginId_);
-    }        
-    
-    //ValidateWSDLCommand
-    ValidateWSDLCommand valWSDLCommand = new ValidateWSDLCommand();
-    valWSDLCommand.setWsdlURI(axisClientDefaultingCommand.getWsdlURL());
-    valWSDLCommand.setWebServicesParser(axisClientDefaultingCommand.getWebServicesParser());
-    status = valWSDLCommand.execute(j2eeEnvironment);
-    if (status.getSeverity()!=Status.OK)
-    {
-      return EnvironmentUtils.convertStatusToIStatus(status, pluginId_);
-    }    
-    
-    //WSDL2JavaCommand
-    WSDL2JavaCommand w2jCommand = new WSDL2JavaCommand();
-    w2jCommand.setJavaWSDLParam(axisClientDefaultingCommand.getJavaWSDLParam());
-    w2jCommand.setWsdlURI(axisClientDefaultingCommand.getWsdlURL());
-    status = w2jCommand.execute(j2eeEnvironment);
-    if (status.getSeverity()!=Status.OK)
-    {
-      return EnvironmentUtils.convertStatusToIStatus(status, pluginId_);
-    }    
-
-    //RefreshProjectCommand
-    RefreshProjectCommand refreshCommand = new RefreshProjectCommand();
-    refreshCommand.setProject(axisClientDefaultingCommand.getClientProject());
-    status = refreshCommand.execute(j2eeEnvironment);
-    if (status.getSeverity()!=Status.OK)
-    {
-      return EnvironmentUtils.convertStatusToIStatus(status, pluginId_);
-    }    
-    
-    Stub2BeanCommand s2bCommand = new Stub2BeanCommand();
-    s2bCommand.setJavaWSDLParam(axisClientDefaultingCommand.getJavaWSDLParam());
-    s2bCommand.setWebServicesParser(axisClientDefaultingCommand.getWebServicesParser());
-    s2bCommand.setClientProject(axisClientDefaultingCommand.getClientProject());
-    status = s2bCommand.execute(j2eeEnvironment); 
-    if (status.getSeverity()!=Status.OK)
-    {
-      return EnvironmentUtils.convertStatusToIStatus(status, pluginId_);
-    }
-
-    //CopyClientWSDLCommand
-    CopyClientWSDLCommand copyCommand = new CopyClientWSDLCommand();
-    copyCommand.setWsdlURL(axisClientDefaultingCommand.getWsdlURL());
-    copyCommand.setClientWSDLPathName(outputWSDLFilePathName);
-    copyCommand.setWsParser(axisClientDefaultingCommand.getWebServicesParser());
-    status = copyCommand.execute(j2eeEnvironment);
-    if (status.getSeverity()!=Status.OK)
-    {
-      return EnvironmentUtils.convertStatusToIStatus(status, pluginId_);
-    }    
-    
-    
-    //BuildProjectCommand
-    BuildProjectCommand buildCommand = new BuildProjectCommand();
-    buildCommand.setProject(axisClientDefaultingCommand.getClientProject());
-    buildCommand.setForceBuild(true);
-    status = buildCommand.execute(j2eeEnvironment);
-    if (status.getSeverity()!=Status.OK)
-    {
-      return EnvironmentUtils.convertStatusToIStatus(status, pluginId_);
-    }    
-        
-    //Calculate the service interface and service endpoint interface names
-    InterfaceNames interfaceNames = calculateSIandSEIName(axisClientDefaultingCommand.getWsdlURL(), serviceQName, axisClientDefaultingCommand.getWebServicesParser());
-    String siName = interfaceNames.getSiName(); 
-    String[] seiNames = interfaceNames.getSeiNames();
-    if (siName==null || siName.length()==0 || seiNames==null || seiNames.length==0)
-    {
-      return new org.eclipse.core.runtime.Status(IStatus.ERROR,pluginId_,0,"Problems!!",null);
-    }
-    
-    //Set info on the dataModel
-    dataModel.setServiceInterfaceName(siName);
-    dataModel.setServiceEndpointInterfaceNames(seiNames);
-    dataModel.setDidGenDescriptors(false);
-    
-    return EnvironmentUtils.convertStatusToIStatus(status, pluginId_);
-  }
-  
-  private InterfaceNames calculateSIandSEIName(String wsdlURL, String serviceQName, WebServicesParser wsParser)
-  {
-    InterfaceNames iNames = new InterfaceNames();
-    String serviceLocalPart = serviceQName.substring(serviceQName.lastIndexOf(':')+1);
-    Map pkg2nsMapping = null;
-    Definition def = wsParser.getWSDLDefinition(wsdlURL);
- 
-    Map services = def.getServices();
-    Service service = null;
-    for (Iterator it = services.values().iterator(); it.hasNext();)
-    {
-      service = (Service)it.next();
-      if (serviceLocalPart.equals(service.getQName().getLocalPart()))
-        break;
-    }        
-      
-    if (service!=null)
-    {
-      String servicePkgName = WSDLUtils.getPackageName(service, pkg2nsMapping);
-      String serviceClassName = service.getQName().getLocalPart();
-      String jndiName = serviceClassName;
-      Map ports = service.getPorts();
-      for (Iterator it2 = ports.values().iterator(); it2.hasNext();)
-      {
-        if (serviceClassName.equals(((Port)it2.next()).getBinding().getPortType().getQName().getLocalPart()))
-        {
-          serviceClassName = serviceClassName + "_Service";
-          break;
-        }
-      }
-      ArrayList seiNames = new ArrayList();
-      for (Iterator it2 = ports.values().iterator(); it2.hasNext();)
-      {
-        Port port = (Port)it2.next();
-        SOAPAddress soapAddress = null;
-        List extensibilityElements = port.getExtensibilityElements();
-        if (extensibilityElements != null)
-        {
-          for (Iterator it3 = extensibilityElements.iterator(); it3.hasNext();)
-          {
-            Object object = it3.next();
-            if (object instanceof SOAPAddress)
-            {
-              soapAddress = (SOAPAddress)object;
-              break;
-            }
-          }
-        }
-        if (soapAddress != null)
-        {
-          PortType portType = port.getBinding().getPortType();
-          QName portTypeQName = portType.getQName();
-          String portTypePkgName = WSDLUtils.getPackageName(portType, pkg2nsMapping);
-          String portTypeClassName = portTypeQName.getLocalPart();
-          if (jndiName.equals(portTypeClassName))
-              portTypeClassName = portTypeClassName + "_Port";
-          seiNames.add(portTypePkgName+"."+portTypeClassName); 
-        }
-      }
-      iNames.setSiName(servicePkgName+"."+serviceClassName);
-      iNames.setSEINames(convertToStringArray(seiNames.toArray()));
-    }    
-    return iNames;
-  }
-  
-  private String[] convertToStringArray(Object[] a)
-  {
-  	if (a==null) return new String[0];
-  	
-  	int length = a.length;
-  	String[] sa = new String[length];
-  	for (int i=0; i<length; i++)
-  	{
-  		Object obj = a[i];
-  		if (obj instanceof String)
-  		{
-  			sa[i] = (String)obj;
-  		}
-  	}
-  	return sa;
-  }  
-  private class InterfaceNames
-  {
-    private String siName_;
-    private String[] seiNames_;
-    
-    public String getSiName()
-    {
-      return siName_;
-    }
-
-    public String[] getSeiNames()
-    {
-      return seiNames_;
-    }
-    
-    
-    public void setSiName(String siName)
-    {
-      siName_ = siName;
-    }
-    
-    public void setSEINames(String[] seiNames)
-    {
-      seiNames_ = seiNames;
-    }
-    
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientInputCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientInputCommand.java
deleted file mode 100644
index 985d486..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientInputCommand.java
+++ /dev/null
@@ -1,95 +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.axis.consumption.ui.command;
-
-
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IContext;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebService;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceClient;
-import org.eclipse.wst.ws.parser.wsil.WebServicesParser;
-
-
-public class AxisClientInputCommand extends SimpleCommand {
-
-	private static String LABEL = "TASK_LABEL_AXIS_CLIENT_INPUT";
-	private static String DESCRIPTION = "TASK_DESC_AXIS_CLIENT_INPUT";
-	
-	private IWebServiceClient wsc_;
-	private String serverProject_; 
-	private IContext context_;
-
-	  private String serviceServerTypeID_;
-	  
-		private boolean generateProxy_ = true;
-		private JavaWSDLParameter javaWSDLParam_;
-		private String clientProject_ = null;
-		private String wsdlURL_;
-		private IServer clientExistingServer_;
-		private String clientServer_;
-		private WebServicesParser webServicesParser_;
-		
-	  private MessageUtils msgUtils_;
-	  
-		/**
-		* Default CTOR
-		*/
-		public AxisClientInputCommand() {
-			String       pluginId = "org.eclipse.jst.ws.axis.consumption.ui";
-		    msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
-		    setName (msgUtils_.getMessage(LABEL));
-			setDescription( msgUtils_.getMessage(DESCRIPTION));
-		}
-		
-		public AxisClientInputCommand(IWebServiceClient wsc, IContext context, String module) {
-			String       pluginId = "org.eclipse.jst.ws.axis.consumption.ui";
-		    msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
-		    setName (msgUtils_.getMessage(LABEL));
-			setDescription( msgUtils_.getMessage(DESCRIPTION));
-			wsc_ = wsc;
-			context_ = context;
-			clientProject_ = module; 
-		}
-		
-	  public Status execute(Environment env)
-	  {
-	    
-		generateProxy_ = context_.getClient();
-		wsdlURL_ = wsc_.getWebServiceClientInfo().getWsdlURL();
-		clientServer_ = wsc_.getWebServiceClientInfo().getServerInstanceId();
-		
-		return new SimpleStatus("");
-	  }
-
-	public String getClientServer() {
-		return clientServer_;
-	}
-
-	public String getClientProject() {
-		return clientProject_;
-	}
-
-	public WebServicesParser getWebServicesParser() {
-		return webServicesParser_;
-	}
-
-	public String getWsdlURL() {
-		return wsdlURL_;
-	}
-	  
-		
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientOutputCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientOutputCommand.java
deleted file mode 100644
index f4b557e..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientOutputCommand.java
+++ /dev/null
@@ -1,66 +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.axis.consumption.ui.command;
-
-
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IContext;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebService;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceClient;
-import org.eclipse.wst.ws.parser.wsil.WebServicesParser;
-
-
-public class AxisClientOutputCommand extends SimpleCommand {
-
-	private static String LABEL = "TASK_LABEL_AXIS_CLIENT_OUTPUT";
-	private static String DESCRIPTION = "TASK_DESC_AXIS_CLIENT_OUTPUT";
-	
-	private IWebServiceClient wsc_;
-	private String proxyBean_;
-		
-	  private MessageUtils msgUtils_;
-	  
-		/**
-		* Default CTOR
-		*/
-		public AxisClientOutputCommand() {
-			String       pluginId = "org.eclipse.jst.ws.axis.consumption.ui";
-		    msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
-		    setName (msgUtils_.getMessage(LABEL));
-			setDescription( msgUtils_.getMessage(DESCRIPTION));
-		}
-		
-		public AxisClientOutputCommand(IWebServiceClient wsc, IContext context, String module) {
-			String       pluginId = "org.eclipse.jst.ws.axis.consumption.ui";
-		    msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
-		    setName (msgUtils_.getMessage(LABEL));
-			setDescription( msgUtils_.getMessage(DESCRIPTION));
-			wsc_ = wsc;
-		}
-		
-	  public Status execute(Environment env)
-	  {		
-		wsc_.getWebServiceClientInfo().setImplURL(proxyBean_);
-		return new SimpleStatus("");
-	  }
-
-	public void setProxyBean(String proxyBean) {
-		this.proxyBean_ = proxyBean;
-	}
-	  
-		
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/CopyClientWSDLCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/CopyClientWSDLCommand.java
deleted file mode 100644
index bb19c91..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/CopyClientWSDLCommand.java
+++ /dev/null
@@ -1,176 +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.axis.consumption.ui.command;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-import java.util.Vector;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Import;
-import javax.wsdl.xml.WSDLWriter;
-
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.wst.command.env.common.FileResourceUtils;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.command.env.core.context.ResourceContext;
-import org.eclipse.wst.ws.parser.wsil.WebServicesParser;
-
-
-/**
- *
- */
-public class CopyClientWSDLCommand extends SimpleCommand
-{
-  private String DESCRIPTION = "TASK_DESC_COPY_CLIENT_WSDL";
-  private String LABEL = "TASK_LABEL_COPY_CLIENT_WSDL";
-  private String pluginId_ = "org.eclipse.jst.ws.axis.consumption.ui";
-  private MessageUtils msgUtils_;  
-  private String wsdlURL_;
-  private String clientWSDLPathName_;
-  private WebServicesParser wsParser_;
-  
-  public CopyClientWSDLCommand()
-  {
-    msgUtils_ = new MessageUtils(pluginId_ + ".plugin", this);
-    setDescription(msgUtils_.getMessage(DESCRIPTION));
-    setName(msgUtils_.getMessage(LABEL));    
-  }
-  
-  public Status execute(Environment env)
-  {
-    Status status = new SimpleStatus("");
-    Definition def = wsParser_.getWSDLDefinition(wsdlURL_);
-    if(def==null)
-    {
-      status = new SimpleStatus(pluginId_, msgUtils_.getMessage("MSG_ERROR_WSDL_NO_DEFINITION",new String[]{wsdlURL_}),Status.ERROR);
-      env.getStatusHandler().reportError(status);
-      return status;
-    }
-    IPath clientWSDLPath = new Path(clientWSDLPathName_);
-    IWorkspaceRoot workspaceRoot = FileResourceUtils.getWorkspaceRoot();
-    status = resolveWSDL(workspaceRoot, def, clientWSDLPath,env);
-    return status;
-  }
-
-	private Status resolveWSDL(
-		IWorkspaceRoot workspace,
-		Definition wsdlDef,
-		IPath wsdlPath,
-		Environment env) {
-		try {
-			writeWSDLFile(workspace, wsdlDef, wsdlPath, env);
-			Map importDefs = wsdlDef.getImports();
-			Set keysSet = importDefs.keySet();
-			for (Iterator e = keysSet.iterator(); e.hasNext();) {
-				Object keyName = e.next();
-				Vector vector = (Vector) importDefs.get(keyName);
-				for (int i = 0; i < vector.size(); i++) {
-					Import importDef = (Import) vector.get(i);
-					Definition def = importDef.getDefinition();
-					String newPathString =
-						wsdlPath.toString().substring(
-							0,
-							wsdlPath.toString().lastIndexOf("/") + 1);	 //$NON-NLS-1$
-					if (isInvalidImportWSDL(importDef.getLocationURI())) {
-					    return new SimpleStatus(pluginId_, msgUtils_.getMessage("MSG_ERROR_IMPORT_WSDL",new String[]{importDef.getLocationURI()}), Status.ERROR);
-					}
-					IPath newPath =
-						new Path(newPathString + importDef.getLocationURI());
-					Status status = resolveWSDL(workspace, def, newPath, env);
-					if (status != null
-						&& status.getSeverity() == Status.ERROR) {
-						return status;
-					}
-				}
-			}
-		} catch (Exception e) {
-		    return new SimpleStatus(pluginId_, msgUtils_.getMessage("MSG_ERROR_WRITE_WSDL",new String[] { wsdlPath.toString() }), Status.ERROR, e);
-		}
-		return new SimpleStatus("");
-	}
-
-	private boolean isInvalidImportWSDL(String wsdlPath) {
-
-		// relative url
-		if (!wsdlPath.toLowerCase().startsWith("http://")) { //$NON-NLS-1$
-
-			if (wsdlPath.indexOf("/") != -1) { //$NON-NLS-1$
-				if (!wsdlPath.startsWith("./")) { //$NON-NLS-1$
-					return true;
-				}
-			}
-
-		}
-		return false;
-	}
-
-	private void writeWSDLFile(
-		IWorkspaceRoot workspace,
-		Definition wsdlDef,
-		IPath wsdlPath,
-		Environment env)
-		throws Exception {
-
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		//WSDLFactory wsdlFactory = WSDLFactory.newInstance();
-		//WSDLWriter wsdlWriter = wsdlFactory.newWSDLWriter();
-		WSDLWriter wsdlWriter = (new org.eclipse.wst.wsdl.internal.impl.wsdl4j.WSDLFactoryImpl()).newWSDLWriter();
-		wsdlWriter.writeWSDL(wsdlDef, baos);
-		byte[] b = baos.toByteArray();
-		ByteArrayInputStream bais = new ByteArrayInputStream(b);
-
-		ResourceContext context =
-			WebServicePlugin.getInstance().getResourceContext();
-		FileResourceUtils.createFile(
-			context,
-			wsdlPath.makeAbsolute(),
-			bais,
-			env.getProgressMonitor(),
-			env.getStatusHandler());
-
-		baos.close();
-		bais.close();
-
-	}  
-  
-  /**
-   * @param clientWSDLPathName_ The clientWSDLPathName_ to set.
-   */
-  public void setClientWSDLPathName(String clientWSDLPathName)
-  {
-    this.clientWSDLPathName_ = clientWSDLPathName;
-  }
-  /**
-   * @param wsdlURL_ The wsdlURL_ to set.
-   */
-  public void setWsdlURL(String wsdlURL)
-  {
-    this.wsdlURL_ = wsdlURL;
-  }
-  /**
-   * @param wsParser_ The wsParser_ to set.
-   */
-  public void setWsParser(WebServicesParser wsParser)
-  {
-    this.wsParser_ = wsParser;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/DefaultsForClientJavaWSDLCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/DefaultsForClientJavaWSDLCommand.java
deleted file mode 100644
index 94d9670..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/DefaultsForClientJavaWSDLCommand.java
+++ /dev/null
@@ -1,147 +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.ui.command;
-
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.consumption.util.PlatformUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-
-
-public class DefaultsForClientJavaWSDLCommand extends SimpleCommand {
-
-	private JavaWSDLParameter javaWSDLParam_;
-	private IProject proxyProject_;
-	private String WSDLServiceURL_;
-	private String WSDLServicePathname_;
-	private MessageUtils msgUtils_;
-	private MessageUtils coreMsgUtils_;
-	
-	private String LABEL = "TASK_LABEL_CLIENT_JAVA_WSDL_DEFAULTS";
-	private String DESCRIPTION = "TASK_DESC_CLIENT_JAVA_WSDL_DEFAULTS";
-
-	public DefaultsForClientJavaWSDLCommand() {
-		String       pluginId = "org.eclipse.jst.ws.axis.consumption.ui";
-	    msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
-	    coreMsgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.core.consumption", this );
-	    setName (msgUtils_.getMessage(LABEL));
-		setDescription( msgUtils_.getMessage(DESCRIPTION));		
-	}
-	
-	/**
-	 * Constructor for DefaultsForClientJavaWSDLCommand.
-	 */
-	public DefaultsForClientJavaWSDLCommand(
-		JavaWSDLParameter javaWSDLParam,
-		Model model) {
-		//super();
-		String       pluginId = "org.eclipse.jst.ws.axis.consumption.ui";
-	    msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
-	    coreMsgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.core.consumption", this );
-	    setName (msgUtils_.getMessage(LABEL));
-		setDescription( msgUtils_.getMessage(DESCRIPTION));
-		this.javaWSDLParam_ = javaWSDLParam;
-	}
-
-	public Status execute(Environment environment) {
-		Status status;
-		if (javaWSDLParam_ == null) {
-			status = new SimpleStatus("DefaultsForClientJavaWSDLCommand", //$NON-NLS-1$
-					coreMsgUtils_.getMessage(
-				"MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET"),
-				Status.ERROR);
-			environment.getStatusHandler().reportError(status);
-			return status;
-		}
-
-		javaWSDLParam_.setMetaInfOnly(false);
-		javaWSDLParam_.setServerSide(JavaWSDLParameter.SERVER_SIDE_NONE);
-		
-		IPath webModuleServerRoot = ResourceUtils.getJavaSourceLocation(proxyProject_);
-		//String output = PlatformUtils.getPlatformURL(webModuleServerRoot);
-		String output =	ResourceUtils.findResource(webModuleServerRoot).getLocation().toString();
-
-		javaWSDLParam_.setJavaOutput(output);
-
-
-		IContainer webModuleContainer = ResourceUtils.getWebModuleServerRoot(proxyProject_);
-		if (webModuleContainer !=null)
-		{
-		  IPath webModulePath = webModuleContainer.getFullPath();
-		  //output =  PlatformUtils.getPlatformURL(webModulePath);
-		  output = ResourceUtils.findResource(webModulePath).getLocation().toString();
-		  javaWSDLParam_.setOutput(output);
-		}
-
-
-		if (WSDLServicePathname_ == null) {
-			
-			if (WSDLServiceURL_ == null) {
-				status = new SimpleStatus("DefaultsForClientJavaWSDLCommand", //$NON-NLS-1$
-						msgUtils_.getMessage(
-					"MSG_ERROR_WSDL_LOCATION_NOT_SET"),
-					Status.ERROR);
-				environment.getStatusHandler().reportError(status);
-				return status;
-			}
-		} else {
-			WSDLServiceURL_ = PlatformUtils.getFileFromPlatform(WSDLServicePathname_);
-		}
-
-		javaWSDLParam_.setInputWsdlLocation(WSDLServiceURL_);
-
-		return new SimpleStatus( "" );
-	}
-
-	/**
-	 * Returns the javaWSDLParam.
-	 * @return JavaWSDLParameter
-	 */
-	public JavaWSDLParameter getJavaWSDLParam() {
-		return javaWSDLParam_;
-	}
-
-	/**
-	 * Sets the javaWSDLParam.
-	 * @param javaWSDLParam The javaWSDLParam to set
-	 */
-	public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam) {
-		this.javaWSDLParam_ = javaWSDLParam;
-	}
-
-	/**
-	 * @param proxyProject_ The proxyProject_ to set.
-	 */
-	public void setProxyProject(IProject proxyProject) {
-		this.proxyProject_ = proxyProject;
-	}
-	/**
-	 * @param serviceURL_ The wSDLServiceURL_ to set.
-	 */
-	public void setWSDLServiceURL(String serviceURL) {
-		WSDLServiceURL_ = serviceURL;
-	}
-	/**
-	 * @param servicePathname_ The wSDLServicePathname_ to set.
-	 */
-	public void setWSDLServicePathname(String servicePathname) {
-		WSDLServicePathname_ = servicePathname;
-	}
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/env/J2EECommandManager.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/env/J2EECommandManager.java
deleted file mode 100644
index 02e56d0..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/env/J2EECommandManager.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.axis.consumption.ui.env;
-
-import org.eclipse.wst.command.env.core.CommandManager;
-import org.eclipse.wst.command.env.core.data.DataMappingRegistry;
-
-/**
- * 
- */
-public class J2EECommandManager implements CommandManager
-{
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.core.CommandManager#isUndoEnabled()
-   */
-  public boolean isUndoEnabled()
-  {
-    return false;
-  }
-
-public DataMappingRegistry getMappingRegistry() {
-	return null;
-}
-  
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/env/J2EEEnvironment.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/env/J2EEEnvironment.java
deleted file mode 100644
index f8b72a0..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/env/J2EEEnvironment.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.jst.ws.internal.axis.consumption.ui.env;
-
-import org.eclipse.wst.command.env.core.CommandManager;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.JavaCompiler;
-import org.eclipse.wst.command.env.core.common.Log;
-import org.eclipse.wst.command.env.core.common.ProgressMonitor;
-import org.eclipse.wst.command.env.core.common.StatusHandler;
-import org.eclipse.wst.command.env.core.uri.SimpleURIFactory;
-import org.eclipse.wst.command.env.core.uri.URIFactory;
-
-
-/**
-*
-*/
-public class J2EEEnvironment implements Environment
-{
-  J2EELog j2eeLog_;
-  J2EEProgressMonitor j2eeProgressMonitor_;
-  J2EEStatusHandler j2eeStatusHandler_;
-  SimpleURIFactory simpleURIFactory_;
-  J2EECommandManager j2eeCommandManager_;
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.core.common.Environment#getLog()
-   */
-  public Log getLog()
-  {
-    if (j2eeLog_ == null)
-    {
-      j2eeLog_ = new J2EELog();
-    }
-    return j2eeLog_;
-    
-  }
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.core.common.Environment#getProgressMonitor()
-   */
-  public ProgressMonitor getProgressMonitor()
-  {
-    if (j2eeProgressMonitor_==null)
-    {
-      j2eeProgressMonitor_ = new J2EEProgressMonitor();
-      
-    }
-    return j2eeProgressMonitor_;
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.core.common.Environment#getStatusHandler()
-   */
-  public StatusHandler getStatusHandler()
-  {
-    if (j2eeStatusHandler_==null)
-    {
-      j2eeStatusHandler_ = new J2EEStatusHandler();
-    }
-    return j2eeStatusHandler_;
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.core.common.Environment#getURIFactory()
-   */
-  public URIFactory getURIFactory()
-  {
-    if (simpleURIFactory_ == null)
-    { 
-      simpleURIFactory_ = new SimpleURIFactory();
-    }
-    return simpleURIFactory_;
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.core.common.Environment#getJavaCompiler()
-   */
-  public JavaCompiler getJavaCompiler()
-  {
-    // TODO Auto-generated method stub
-    return null;
-  }
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.core.common.Environment#getCommandManager()
-   */
-  public CommandManager getCommandManager()
-  {
-    if(j2eeCommandManager_ == null)
-    {
-      j2eeCommandManager_ = new J2EECommandManager(); 
-    }
-    return j2eeCommandManager_;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/env/J2EELog.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/env/J2EELog.java
deleted file mode 100644
index e97d6bc..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/env/J2EELog.java
+++ /dev/null
@@ -1,77 +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.axis.consumption.ui.env;
-
-import org.eclipse.wst.command.env.core.common.Log;
-import org.eclipse.wst.command.env.core.common.Status;
-
-/**
-*
-*/
-public class J2EELog implements Log
-{
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.command.env.core.common.Log#isEnabled()
-	 */
-	public boolean isEnabled() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.command.env.core.common.Log#isEnabled(java.lang.String)
-	 */
-	public boolean isEnabled(String option) {
-		// TODO Auto-generated method stub
-		return false;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.command.env.core.common.Log#log(int, int, java.lang.Object, java.lang.String, java.lang.Object)
-	 */
-	public void log(int severity, int messageNum, Object caller, String method,
-			Object object) {
-		// TODO Auto-generated method stub
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.command.env.core.common.Log#log(int, int, java.lang.Object, java.lang.String, org.eclipse.wst.command.env.core.common.Status)
-	 */
-	public void log(int severity, int messageNum, Object caller, String method,
-			Status status) {
-		// TODO Auto-generated method stub
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.command.env.core.common.Log#log(int, int, java.lang.Object, java.lang.String, java.lang.Throwable)
-	 */
-	public void log(int severity, int messageNum, Object caller, String method,
-			Throwable throwable) {
-		// TODO Auto-generated method stub
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.command.env.core.common.Log#log(int, java.lang.String, int, java.lang.Object, java.lang.String, java.lang.Object)
-	 */
-	public void log(int severity, String option, int messageNum, Object caller,
-			String method, Object object) {
-		// TODO Auto-generated method stub
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.command.env.core.common.Log#log(int, java.lang.String, int, java.lang.Object, java.lang.String, org.eclipse.wst.command.env.core.common.Status)
-	 */
-	public void log(int severity, String option, int messageNum, Object caller,
-			String method, Status status) {
-		// TODO Auto-generated method stub
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.command.env.core.common.Log#log(int, java.lang.String, int, java.lang.Object, java.lang.String, java.lang.Throwable)
-	 */
-	public void log(int severity, String option, int messageNum, Object caller,
-			String method, Throwable throwable) {
-		// TODO Auto-generated method stub
-	}
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/env/J2EEProgressMonitor.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/env/J2EEProgressMonitor.java
deleted file mode 100644
index 161a8db..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/env/J2EEProgressMonitor.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.axis.consumption.ui.env;
-
-import org.eclipse.wst.command.env.core.common.ProgressMonitor;
-
-/**
- * @author rsinha
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class J2EEProgressMonitor implements ProgressMonitor
-{
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.core.common.ProgressMonitor#report(java.lang.String)
-   */
-  public void report(String progress)
-  {
-    // TODO Auto-generated method stub
-  }
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.core.common.ProgressMonitor#getChildProgressMonitor()
-   */
-  public ProgressMonitor getChildProgressMonitor()
-  {
-    // TODO Auto-generated method stub
-    return null;
-  }
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.core.common.ProgressMonitor#isCancelRequested()
-   */
-  public boolean isCancelRequested()
-  {
-    // TODO Auto-generated method stub
-    return false;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/env/J2EEStatusHandler.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/env/J2EEStatusHandler.java
deleted file mode 100644
index c2a9c9c..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/env/J2EEStatusHandler.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 Eclipse Public License v1.0
- * which accompanies 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.ui.env;
-
-import org.eclipse.wst.command.env.core.common.Choice;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.command.env.core.common.StatusException;
-import org.eclipse.wst.command.env.core.common.StatusHandler;
-
-/**
- * 
- */
-public class J2EEStatusHandler implements StatusHandler
-{
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.core.common.StatusHandler#report(org.eclipse.wst.command.env.core.common.Status, org.eclipse.wst.command.env.core.common.Choice[])
-   */
-  public Choice report(Status status, Choice[] choices)
-  {
-    // TODO Auto-generated method stub
-    return null;
-  }
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.core.common.StatusHandler#report(org.eclipse.wst.command.env.core.common.Status)
-   */
-  public void report(Status status) throws StatusException
-  {
-    // TODO Auto-generated method stub
-  }
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.core.common.StatusHandler#reportError(org.eclipse.wst.command.env.core.common.Status)
-   */
-  public void reportError(Status status)
-  {
-    // TODO Auto-generated method stub
-  }
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.core.common.StatusHandler#reportInfo(org.eclipse.wst.command.env.core.common.Status)
-   */
-  public void reportInfo(Status status)
-  {
-    // TODO Auto-generated method stub
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/plugin/WebServiceAxisConsumptionUIPlugin.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/plugin/WebServiceAxisConsumptionUIPlugin.java
deleted file mode 100644
index 252b931..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/plugin/WebServiceAxisConsumptionUIPlugin.java
+++ /dev/null
@@ -1,134 +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.axis.consumption.ui.plugin;
-
-import java.text.MessageFormat;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPluginDescriptor;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.wst.command.env.core.common.Log;
-import org.eclipse.wst.command.env.eclipse.EclipseLog;
-
-
-/**
-* 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 WebServiceAxisConsumptionUIPlugin extends Plugin
-{
-
-	/**
-	* The identifier of the descriptor of this plugin in plugin.xml.
-	*/
-	public static final String ID =
-		"org.eclipse.jst.ws.axis.consumption.ui";
-
-	/**
-	* The reference to the singleton instance of this plugin.
-	*/
-	private static WebServiceAxisConsumptionUIPlugin instance_;
-	private Log log_;
-
-	/**
-	* Constructs a runtime plugin object for this plugin.
-	* The "plugin" element in plugin.xml should include the attribute
-	* class = "org.eclipse.jst.ws.internal.ui.plugin.WebServicePlugin".
-	* @param descriptor The descriptor of this plugin.
-	*/
-	public WebServiceAxisConsumptionUIPlugin(IPluginDescriptor descriptor) {
-		super(descriptor);
-		if (instance_ == null) {
-			instance_ = this;
-		}
-		log_ = new EclipseLog();
-
-	}
-
-	/**
-	* Returns the singleton instance of this plugin. Equivalent to calling
-	* (WebServiceWasConsumptionPlugin)Platform.getPlugin("org.eclipse.jst.ws.was.v5.tp");
-	* @return The WebServiceWasConsumptionPlugin singleton.
-	*/
-	static public WebServiceAxisConsumptionUIPlugin getInstance() {
-		return instance_;
-	}
-
-	/**
-	* Called once by the platform when this plugin is first loaded.
-	* @throws CoreException If this plugin fails to start.
-	*/
-	public void startup() throws CoreException {
-		log_.log(Log.INFO, 5066, this, "startup", "Starting plugin org.eclipse.jst.ws.axis.consumption.ui");
-		super.startup();
-	}
-
-	/**
-	* Called once by the platform when this plugin is unloaded.
-	* @throws CoreException If this plugin fails to shutdown.
-	*/
-	public void shutdown() throws CoreException {
-		log_.log(Log.INFO, 5067, this, "shutdown", "Shutting plugin org.eclipse.jst.ws.axis.consumption.ui");
-		super.shutdown();
-	}
-
-	/**
-	* 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) {
-		return instance_.getDescriptor().getResourceString(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);
-	}
-
-	public String getPluginStateLocation() {
-		return Platform
-			.getPluginStateLocation(this)
-			.addTrailingSeparator()
-			.toOSString();
-	}
-
-	public String getPluginInstallLocation() {
-		try {
-			return Platform.resolve(getDescriptor().getInstallURL()).getFile();
-		} catch (Exception e) {
-			return null;
-		}
-	}
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/AddJarsToProjectBuildPathTask.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/AddJarsToProjectBuildPathTask.java
deleted file mode 100644
index a76e9d1..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/AddJarsToProjectBuildPathTask.java
+++ /dev/null
@@ -1,228 +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.ui.task;
-
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IPluginDescriptor;
-import org.eclipse.core.runtime.IPluginRegistry;
-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.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.j2ee.internal.project.IWebNatureConstants;
-import org.eclipse.jst.j2ee.internal.web.operations.J2EEWebNatureRuntime;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.plugin.WebServiceAxisConsumptionUIPlugin;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.ProgressMonitor;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.command.env.core.common.StatusException;
-import org.eclipse.wst.command.env.ui.eclipse.EclipseProgressMonitor;
-
-public class AddJarsToProjectBuildPathTask extends SimpleCommand {
-
-	public static String AXIS_RUNTIME_PLUGIN_ID = "org.eclipse.jst.ws.axis.rt"; //$NON-NLS-1$
-
-	private String DESCRIPTION = "TASK_DESC_JARS_TO_PROJECT";
-	private String LABEL = "TASK_LABEL_JARS_TO_PROJECT";
-
-	private IJavaProject javaProject_;
-	private IClasspathEntry[] oldClasspath_;
-	private IClasspathEntry[] newClasspath_;
-	private JavaWSDLParameter javaWSDLParam_;
-	private boolean isJ2EE_13 = true;
-	private MessageUtils msgUtils_;
-	
-	private IProject project;
-
-	public AddJarsToProjectBuildPathTask()
-  {
-		String pluginId = "org.eclipse.jst.ws.axis.consumption.ui";
-		msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-		setDescription(msgUtils_.getMessage(DESCRIPTION));
-		setName(msgUtils_.getMessage(LABEL));
-	}
-
-	/**
-	* Execute AddJarsToProjectBuildPathTask
-	*/
-	public Status execute(Environment environment) {
-		try {
-			if (project.hasNature(IWebNatureConstants.J2EE_NATURE_ID)) {
-				J2EEWebNatureRuntime webNatureRuntime =
-					(J2EEWebNatureRuntime) project.getNature(
-						IWebNatureConstants.J2EE_NATURE_ID);
-				isJ2EE_13 = webNatureRuntime.isJ2EE1_3();
-			}
-		} catch (Exception e) {
-		}
-    Status status = new SimpleStatus("");
-		if (!isJ2EE_13)
-		{
-		//	AddJar(project, null, "XERCES_API_JAR", status, environment);
-		}
-		return status;
-	}
-
-	private void AddJar(IProject webProject, String pluginId, String jarName, Status status, Environment env)  {
-	   //
-	   // Get the current classpath.
-	   //
-	   javaProject_ = null;
-	   oldClasspath_ = null;
-	   try
-	   {    
-		 javaProject_ = JavaCore.create(webProject);    
-		 if (javaProject_ != null)
-		 {
-		   oldClasspath_ = javaProject_.getRawClasspath();
-		 }
-		 else
-		 {
-		   status = new SimpleStatus("", msgUtils_.getMessage("MSG_WARN_NO_JAVA_NATURE"), Status.ERROR);	
-		   env.getStatusHandler().reportError(status);
-		   return;
-		 }
-	   }
-	   catch (JavaModelException e)
-	   {
-		   status = new SimpleStatus("", msgUtils_.getMessage("MSG_WARN_NO_JAVA_NATURE"), Status.ERROR);
-		   env.getStatusHandler().reportError(status);
-		   return;	   	
-	   }
-
-	   boolean found = false;
-	   for (int i=0; i<oldClasspath_.length; i++)
-	   {
-		 found = found || oldClasspath_[i].getPath().toString().toLowerCase().endsWith(jarName.toLowerCase());
-	   }
-
-	   if (found) 
-	   {
-		 return;
-	   }
-
-	   newClasspath_ = new IClasspathEntry[oldClasspath_.length + 1];
-	   int i=0;
-	   while (i<oldClasspath_.length)
-	   {
-		 newClasspath_[i] = oldClasspath_[i];
-		 i++;
-	   }
-
-	   try
-	   {
-		 if(pluginId!=null)
-		 {
-		   newClasspath_[i++] = JavaCore.newLibraryEntry(getTheJarPath(pluginId,jarName), null, null);
-		 }
-		 else
-		 {
-		   newClasspath_[i++] = JavaCore.newVariableEntry(getTheJarPath(pluginId,jarName), null, null);
-		 }
-	   }
-	   catch (CoreException e)
-	   {
-		 status = new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_BAD_BUILDPATH"), Status.WARNING, e);
-		 try
-		 {
-		 	env.getStatusHandler().report(status);
-		 }
-		 catch(StatusException se)
-		 {
-		 	status = new SimpleStatus("","User aborted",Status.ERROR);
-		 }
-		 return;
-	   }
-
-	   //
-	   // Then update the project classpath.
-	   //
-	   try
-	   {
-	   	 ProgressMonitor monitor = env.getProgressMonitor();
-	   	 IProgressMonitor eclipseMonitor = null;
-	   	 if (monitor instanceof EclipseProgressMonitor)
-	   	 {
-	   	 	eclipseMonitor = ((EclipseProgressMonitor)monitor).getMonitor();
-	   	 }
-		 javaProject_.setRawClasspath(newClasspath_,eclipseMonitor);
-	   }
-	   catch (JavaModelException e)
-	   {
-		 status = new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_BAD_BUILDPATH"), Status.WARNING, e);
-		 try
-		 {
-		 	env.getStatusHandler().report(status);	
-		 }
-		 catch(StatusException se)
-		 {
-		 	status = new SimpleStatus("", "User aborted", Status.ERROR);
-		 }
-		 return;
-	   }
-	 }
-
-	//
-	// Returns the local native pathname of the jar.
-	//
-	private IPath getTheJarPath(String pluginId, String theJar)
-		throws CoreException {
-		try {
-			if (pluginId != null) {
-				IPluginRegistry pluginRegistry = Platform.getPluginRegistry();
-				IPluginDescriptor pluginDescriptor =
-					pluginRegistry.getPluginDescriptor(pluginId);
-				URL localURL =
-					Platform.asLocalURL(
-						new URL(pluginDescriptor.getInstallURL(), theJar));
-				return new Path(localURL.getFile());
-			} else {
-				return new Path(theJar);
-			}
-		} catch (MalformedURLException e) {
-			throw new CoreException(
-				new org.eclipse.core.runtime.Status(
-					IStatus.WARNING,
-					WebServiceAxisConsumptionUIPlugin.ID,
-					0,
-					msgUtils_.getMessage("MSG_BAD_AXIS_JAR_URL"),
-					e));
-		} catch (IOException e) {
-			throw new CoreException(
-				new org.eclipse.core.runtime.Status(
-					IStatus.WARNING,
-					WebServiceAxisConsumptionUIPlugin.ID,
-					0,
-					msgUtils_.getMessage("MSG_BAD_AXIS_JAR_URL"),
-					e));
-		}
-	}
-
-	public void setProject(IProject project)
-	{
-	  this.project = project;
-	}
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/CheckAxisDeploymentDescriptorsTask.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/CheckAxisDeploymentDescriptorsTask.java
deleted file mode 100644
index 179a072..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/CheckAxisDeploymentDescriptorsTask.java
+++ /dev/null
@@ -1,92 +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.ui.task;
-
-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.IPath;
-import org.eclipse.jst.j2ee.internal.project.IWebNatureConstants;
-import org.eclipse.jst.j2ee.internal.web.operations.J2EEWebNatureRuntime;
-import org.eclipse.jst.ws.internal.common.EnvironmentUtils;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.command.env.core.common.StatusException;
-
-public class CheckAxisDeploymentDescriptorsTask extends SimpleCommand {
-	
-	private MessageUtils msgUtils_;
-	private MessageUtils coreMsgUtils_;
-	private IProject serverProject;
-    
-  public CheckAxisDeploymentDescriptorsTask()
-  {
-    String pluginId = "org.eclipse.jst.ws.axis.consumption.ui";
-    msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-    coreMsgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.core.consumption", this );
-    setDescription(msgUtils_.getMessage("CHECK_WS_DD_TASK_DESCRIPTION"));
-    setName(msgUtils_.getMessage("CHECK_WS_DD_TASK_LABEL"));        
-  }
-	
-	public Status execute(Environment env) {
-		Status status = new SimpleStatus( "" );
-		if(EnvironmentUtils.getResourceContext(env).isOverwriteFilesEnabled()) {
-      return status;
-		}
-
-		IPath filePath = null;
-    IProject project = serverProject;
-    filePath = project.getFullPath();
-		try {
-			if (project.hasNature(IWebNatureConstants.J2EE_NATURE_ID)) {
-        J2EEWebNatureRuntime webProject = (J2EEWebNatureRuntime) project.getNature(IWebNatureConstants.J2EE_NATURE_ID);
-        filePath = filePath.append(webProject.getWEBINFPath());
-        filePath = filePath.append("/server-config.wsdd");
-      }
-		} catch (CoreException e) {
-			status = new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_DEFAULT_BEAN"), Status.ERROR, e);
-			env.getStatusHandler().reportError(status);
-			return status;
-		}
-
-		if(filePath==null || filePath.isEmpty())
-		{
-			status = new SimpleStatus("", coreMsgUtils_.getMessage("MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET"), Status.ERROR);
-			env.getStatusHandler().reportError(status);
-			return status;			
-		}
-
-		IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(filePath);
-		if (file.exists() && !EnvironmentUtils.getResourceContext(env).isOverwriteFilesEnabled())   {
-			status = new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_XML_FILE_OVERWRITE_DISABLED"), Status.WARNING);
-			try
-			{
-				env.getStatusHandler().report(status);
-			}
-			catch(StatusException se)
-			{
-				status = new SimpleStatus("", "User aborted",Status.ERROR);
-			}
-			
-			return status;
-		}
-		return status;
-	}
-
-	public void setServerProject(IProject serverProject)
-	{
-	  this.serverProject = serverProject;
-	}
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/CopyAxisJarCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/CopyAxisJarCommand.java
deleted file mode 100644
index 22739b4..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/CopyAxisJarCommand.java
+++ /dev/null
@@ -1,149 +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.ui.task;
-
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IPluginDescriptor;
-import org.eclipse.core.runtime.IPluginRegistry;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.wst.command.env.common.FileResourceUtils;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.command.env.core.context.ResourceContext;
-import org.eclipse.wst.command.env.core.context.TransientResourceContext;
-
-
-public class CopyAxisJarCommand extends SimpleCommand {
-
-  public static String AXIS_RUNTIME_PLUGIN_ID = "org.apache.axis11"; //$NON-NLS-1$
-
-  private String DESCRIPTION = "TASK_DESC_COPY_JARS_TO_PROJECT";
-  private String LABEL = "TASK_LABEL_COPY_JARS_TO_PROJECT";
-
-  private MessageUtils msgUtils_;
-  private MessageUtils baseConMsgUtils_;
-  private IProject project;
-  private Boolean projectRestartRequired_ = Boolean.FALSE;
-
-  /**
-   * Default CTOR;
-   */
-  public CopyAxisJarCommand() {
-    String pluginId = "org.eclipse.jst.ws.axis.consumption.ui";
-    msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-    baseConMsgUtils_ = new MessageUtils( "org.eclipse.jst.ws.consumption.plugin", this );
-    setDescription(msgUtils_.getMessage(DESCRIPTION));
-    setName(msgUtils_.getMessage(LABEL));
-  }
-
-  /**
-   * Execute the command
-   */
-  public Status execute(Environment env) {
-    Status status = new SimpleStatus("");
-    env.getProgressMonitor().report(msgUtils_.getMessage("PROGRESS_INFO_COPY_AXIS_CFG"));
-    copyAxisJarsToProject(project, status, env);
-    return status;
-
-  }
-
-  private void copyAxisJarsToProject(IProject project, Status status, Environment env) {
-//    IPath webModulePath = ResourceUtils.getWebModuleServerRoot(project).getFullPath();
-	IPath webModulePath = J2EEUtils.getFirstWebContentPath(project);
-    if (webModulePath == null) {
-      status = new SimpleStatus("", baseConMsgUtils_.getMessage("MSG_ERROR_PROJECT_NOT_FOUND"), Status.ERROR);
-      env.getStatusHandler().reportError(status);
-      return;
-    }
-
-    copyIFile("lib/axis.jar", //$NON-NLS-1$
-        webModulePath, "WEB-INF/lib/axis.jar", status, env); //$NON-NLS-1$
-    if (status.getSeverity() == Status.ERROR)
-      return;
-    copyIFile("lib/log4j-1.2.8.jar", //$NON-NLS-1$
-        webModulePath, "WEB-INF/lib/log4j-1.2.8.jar", status, env); //$NON-NLS-1$
-    if (status.getSeverity() == Status.ERROR)
-      return;
-    copyIFile("lib/commons-discovery.jar", //$NON-NLS-1$
-        webModulePath, "WEB-INF/lib/commons-discovery.jar", status, env); //$NON-NLS-1$
-    if (status.getSeverity() == Status.ERROR)
-      return;
-    copyIFile("lib/commons-logging.jar", //$NON-NLS-1$
-        webModulePath, "WEB-INF/lib/commons-logging.jar", status, env); //$NON-NLS-1$
-    if (status.getSeverity() == Status.ERROR)
-      return;
-    copyIFile("lib/saaj.jar", //$NON-NLS-1$
-        webModulePath, "WEB-INF/lib/saaj.jar", status, env); //$NON-NLS-1$
-    if (status.getSeverity() == Status.ERROR)
-      return;
-    copyIFile("lib/jaxrpc.jar", //$NON-NLS-1$
-        webModulePath, "WEB-INF/lib/jaxrpc.jar", status, env); //$NON-NLS-1$
-    if (status.getSeverity() == Status.ERROR)
-      return;
-    copyIFile("lib/wsdl4j.jar", //$NON-NLS-1$
-        webModulePath, "WEB-INF/lib/wsdl4j.jar", status, env); //$NON-NLS-1$
-    if (status.getSeverity() == Status.ERROR)
-      return;
-    return;
-  }
-
-  /**
-   *  
-   */
-  private void copyIFile(String source, IPath targetPath, String targetFile, Status status, Environment env) {
-    IPath target = targetPath.append(new Path(targetFile));
-    env.getProgressMonitor().report(baseConMsgUtils_.getMessage("PROGRESS_INFO_COPYING_FILE"));
-
-    try {
-      ResourceContext context = new TransientResourceContext();
-      context.setOverwriteFilesEnabled(true);
-      context.setCreateFoldersEnabled(true);
-      context.setCheckoutFilesEnabled(true);
-      IPluginRegistry pluginRegistry = Platform.getPluginRegistry();
-      IPluginDescriptor pluginDescriptor = pluginRegistry.getPluginDescriptor(AXIS_RUNTIME_PLUGIN_ID);
-      Plugin axisrt_plugin = pluginDescriptor.getPlugin();
-      IFile resource = ResourceUtils.getWorkspaceRoot().getFile(target);
-      if (!resource.exists()) {
-        IFile file = FileResourceUtils.createFile(context, target, axisrt_plugin.openStream(new Path(source)), env.getProgressMonitor(), env
-            .getStatusHandler());
-        if (projectRestartRequired_.booleanValue() == false && file.exists()) {
-          projectRestartRequired_ = Boolean.TRUE;
-        }
-
-      }
-      IFile file = FileResourceUtils.createFile(context, target, axisrt_plugin.openStream(new Path(source)), env.getProgressMonitor(), env
-          .getStatusHandler());
-    }
-    catch (Exception e) {
-      status = new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_FILECOPY"), Status.ERROR, e);
-      env.getStatusHandler().reportError(status);
-
-    }
-  }
-
-  public void setProject(IProject project) {
-    this.project = project;
-  }
-
-  public boolean getProjectRestartRequired() {
-    return projectRestartRequired_.booleanValue();
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/DefaultsForHTTPBasicAuthCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/DefaultsForHTTPBasicAuthCommand.java
deleted file mode 100644
index 5742613..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/DefaultsForHTTPBasicAuthCommand.java
+++ /dev/null
@@ -1,144 +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.axis.consumption.ui.task;
-
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.consumption.ui.wsil.DialogWWWAuthentication;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.parser.discovery.WebServicesParserExt;
-import org.eclipse.wst.ws.parser.wsil.WWWAuthenticationException;
-import org.eclipse.wst.ws.parser.wsil.WebServiceEntity;
-import org.eclipse.wst.ws.parser.wsil.WebServicesParser;
-
-
-
-public class DefaultsForHTTPBasicAuthCommand extends SimpleCommand
-{
-  private WebServicesParser webServicesParser;
-  private String wsdlServiceURL;
-  private JavaWSDLParameter javaWSDLParam;
-  private Model model;
-
-  public DefaultsForHTTPBasicAuthCommand()
-  {
-    super("org.eclipse.jst.ws.internal.axis.consumption.ui.task.DefaultsForHTTPBasicAuthCommand", "org.eclipse.jst.ws.internal.axis.consumption.ui.task.DefaultsForHTTPBasicAuthCommand");
-  }
-  
-  public Status execute(Environment env)
-  {
-    //WebServiceElement wse = WebServiceElement.getWebServiceElement(model);
-    //setWebServicesParser((WebServicesParser)wse.getWSParser());
-    //setWsdlServiceURL(wse.getWSDLServiceURL());
-    //if (wsdlServiceURL == null || wsdlServiceURL.length() <= 0)
-    //  setWsdlServiceURL((new Utils()).toFileSystemURI(wse.getWSDLServicePathname()));
-    
-    if (wsdlServiceURL != null && wsdlServiceURL.length() > 0)
-    {
-      if (webServicesParser == null)
-      {
-        webServicesParser = new WebServicesParserExt();
-        //wse.setWSParser(webServicesParser);
-      }
-      WebServiceEntity wsEntity = webServicesParser.getWebServiceEntityByURI(wsdlServiceURL);
-      if (wsEntity == null || !wsEntity.isEntityResolved())
-      {
-        webServicesParser.setURI(wsdlServiceURL);
-        try
-        {
-          webServicesParser.parse(WebServicesParser.PARSE_NONE);
-        }
-        catch (WWWAuthenticationException wwwae)
-        {
-          DialogWWWAuthentication dialog = new DialogWWWAuthentication(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell());
-          dialog.handleWWWAuthentication(wwwae);
-          String username = dialog.getUsername();
-          String password = dialog.getPassword();
-          if (username != null && password != null)
-          {
-            webServicesParser.setHTTPBasicAuthUsername(username);
-            webServicesParser.setHTTPBasicAuthPassword(password);
-            try
-            {
-              webServicesParser.parse(WebServicesParser.PARSE_NONE);
-            }
-            catch (Throwable t)
-            {
-            }
-            webServicesParser.setHTTPBasicAuthUsername(null);
-            webServicesParser.setHTTPBasicAuthPassword(null);
-          }
-        }
-        catch (Throwable t)
-        {
-        }
-        wsEntity = webServicesParser.getWebServiceEntityByURI(wsdlServiceURL);
-      }
-      if (wsEntity != null && wsEntity.getType() == WebServiceEntity.TYPE_WSDL)
-      {
-        String httpUsername = wsEntity.getHTTPUsername();
-        String httpPassword = wsEntity.getHTTPPassword();
-        if (httpUsername != null && httpPassword != null)
-        {
-          javaWSDLParam.setHTTPUsername(httpUsername);
-          javaWSDLParam.setHTTPPassword(httpPassword);
-        }
-      }
-    }
-    return new SimpleStatus("");
-  }
-  /**
-   * @param javaWSDLParam The javaWSDLParam to set.
-   */
-  public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam) {
-    this.javaWSDLParam = javaWSDLParam;
-  }
-
-  /**
-   * @param model The model to set.
-   */
-  public void setModel(Model model) {
-    this.model = model;
-  }
-
-  /**
-   * @param wsdlServiceURL The wsdlServiceURL to set.
-   */
-  public void setWsdlServiceURL(String wsdlServiceURL) {
-    this.wsdlServiceURL = wsdlServiceURL;
-  }
-
-  /**
-   * @return Returns the javaWSDLParam.
-   */
-  public JavaWSDLParameter getJavaWSDLParam() {
-    return javaWSDLParam;
-  }
-
-  /**
-   * @return Returns the webServicesParser.
-   */
-  public WebServicesParser getWebServicesParser() {
-    return webServicesParser;
-  }
-
-  /**
-   * @param webServicesParser The webServicesParser to set.
-   */
-  public void setWebServicesParser(WebServicesParser webServicesParser) {
-    this.webServicesParser = webServicesParser;
-  }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/RefreshProjectCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/RefreshProjectCommand.java
deleted file mode 100644
index bb08800..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/RefreshProjectCommand.java
+++ /dev/null
@@ -1,67 +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.ui.task;
-
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.plugin.WebServiceAxisConsumptionUIPlugin;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-
-
-
-public class RefreshProjectCommand extends SimpleCommand
-{
-	private static final String LABEL = "TASK_LABEL_REFESH_PROJECT";
-	private static final String DESCRIPTION = "TASK_DESC_REFESH_PROJECT";
-	
-	private IProject project;
-	private MessageUtils msgUtils_;
-
-	public RefreshProjectCommand()
-	{
-		msgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.ui.plugin", this );
-		setName( msgUtils_.getMessage( LABEL ) );
-		setDescription( msgUtils_.getMessage( DESCRIPTION ));
-	}
-
-	/**
-	* Execute RefreshProjectTask
-	*/
-	public Status execute(Environment env)
-	{
-		try
-		{
-			if (project!=null)
-			project.refreshLocal(IProject.DEPTH_INFINITE, new NullProgressMonitor());
-		}
-		catch (CoreException e)
-		{
-		  Status status = new SimpleStatus(WebServiceAxisConsumptionUIPlugin.ID, msgUtils_.getMessage("MSG_ERROR_REFRESH_PROJECT"), Status.ERROR, e);
-		  env.getStatusHandler().reportError(status);
-		  return status;
-		}
-		return new SimpleStatus("");
-	}
-
-	public IProject getProject() {
-		return project;
-	}
-
-	public void setProject(IProject project) {
-		this.project = project;
-	}
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/Stub2BeanCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/Stub2BeanCommand.java
deleted file mode 100644
index d873507..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/Stub2BeanCommand.java
+++ /dev/null
@@ -1,254 +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.ui.task;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Port;
-import javax.wsdl.PortType;
-import javax.wsdl.Service;
-import javax.wsdl.extensions.soap.SOAPAddress;
-import javax.xml.namespace.QName;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.consumption.util.WSDLUtils;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.ws.parser.wsil.WebServicesParser;
-
-
-public class Stub2BeanCommand extends SimpleCommand
-{
-  private WebServicesParser webServicesParser;
-  private JavaWSDLParameter javaWSDLParam_;
-  private String discoveredWsdlPortElementName;
-  private Vector portTypes_;
-  private String proxyBean_;
-  
-  private IProject clientProject_;
-
-  public Stub2BeanCommand()
-  {
-    super("org.eclipse.jst.ws.was.creation.ui.task.Stub2BeanCommand", "org.eclipse.jst.ws.was.creation.ui.task.Stub2BeanCommand");
-    portTypes_ = new Vector();
-    //setRunInWorkspaceModifyOperation(false);
-  }
-
-  /**
-  * Execute
-  */
-  public Status execute(Environment env)
-  {        
-    String inputWsdlLocation = javaWSDLParam_.getInputWsdlLocation();
-    Definition def = webServicesParser.getWSDLDefinition(inputWsdlLocation);
-    /*
-    * Hack: Axis is not using a proper java.net.URL as its inputWsdlLocation.
-    * We need to convert it to a proper file URL.
-    */
-    if (def == null)
-    {
-      File file = new File(inputWsdlLocation);
-      if (file.exists())
-      {
-        try
-        {
-          def = webServicesParser.getWSDLDefinition(file.toURL().toString());
-        }
-        catch (MalformedURLException murle)
-        {
-        }
-      }
-    }
-    Map pkg2nsMapping = javaWSDLParam_.getMappings();
-    Map services = def.getServices();
-    for (Iterator it = services.values().iterator(); it.hasNext();)
-    {
-      Service service = (Service)it.next();
-      String servicePkgName = WSDLUtils.getPackageName(service, pkg2nsMapping);
-      String serviceClassName = computeClassName(service.getQName().getLocalPart());
-      String jndiName = serviceClassName;
-      Map ports = service.getPorts();
-      for (Iterator it2 = ports.values().iterator(); it2.hasNext();)
-      {
-        if (serviceClassName.equals(computeClassName(((Port)it2.next()).getBinding().getPortType().getQName().getLocalPart())))
-        {
-          serviceClassName = serviceClassName + "_Service";
-          break;
-        }
-      }
-      for (Iterator it2 = ports.values().iterator(); it2.hasNext();)
-      {
-        Port port = (Port)it2.next();
-        if (discoveredWsdlPortElementName != null && !discoveredWsdlPortElementName.equals(port.getName()))
-          continue;
-        SOAPAddress soapAddress = null;
-        List extensibilityElements = port.getExtensibilityElements();
-        if (extensibilityElements != null)
-        {
-          for (Iterator it3 = extensibilityElements.iterator(); it3.hasNext();)
-          {
-            Object object = it3.next();
-            if (object instanceof SOAPAddress)
-            {
-              soapAddress = (SOAPAddress)object;
-              break;
-            }
-          }
-        }
-        if (soapAddress != null)
-        {
-          PortType portType = port.getBinding().getPortType();
-          QName portTypeQName = portType.getQName();
-          StringBuffer portTypeID = new StringBuffer();
-          portTypeID.append(portTypeQName.getNamespaceURI());
-          portTypeID.append("#");
-          portTypeID.append(portTypeQName.getLocalPart());
-          if (!portTypes_.contains(portTypeID.toString()))
-          {
-            portTypes_.add(portTypeID.toString());
-            Stub2BeanInfo stub2BeanInfo = new Stub2BeanInfo();
-            stub2BeanInfo.setClientProject(clientProject_);
-            String portTypePkgName = WSDLUtils.getPackageName(portType, pkg2nsMapping);
-            String portTypeClassName = computeClassName(portTypeQName.getLocalPart());
-            stub2BeanInfo.setPackage(portTypePkgName);
-            stub2BeanInfo.setClass(portTypeClassName + "Proxy");
-            proxyBean_ = portTypePkgName+"."+portTypeClassName+"Proxy";
-            if (jndiName.equals(portTypeClassName))
-              portTypeClassName = portTypeClassName + "_Port";
-            stub2BeanInfo.addSEI(portTypePkgName, portTypeClassName, servicePkgName, serviceClassName, jndiName, port.getName());
-            try
-            {              
-              stub2BeanInfo.write( env.getProgressMonitor(), env.getStatusHandler() );
-              if (discoveredWsdlPortElementName != null)
-              {
-                // The discovered port was processed. Ignore all other ports and services.
-                return new SimpleStatus("");
-              }
-            }
-            catch (CoreException ce)
-            {
-            }
-            catch (IOException ioe)
-            {
-            }
-          }
-        }
-      }
-    }
-    return new SimpleStatus("");
-  }
-  
-  private final char UNDERSCORE = '_';
-
-  private String computeClassName(String className)
-  {
-    String classNameCopy = className;
-    int i = classNameCopy.indexOf(UNDERSCORE);
-    while (i != -1)
-    {
-      char c = classNameCopy.charAt(i+1);
-      if (Character.isLowerCase(c))
-      {
-        StringBuffer sb = new StringBuffer();
-        sb.append(classNameCopy.substring(0, i+1));
-        sb.append(Character.toUpperCase(c));
-        sb.append(classNameCopy.substring(i+2, classNameCopy.length()));
-        classNameCopy = sb.toString();
-      }
-      i = classNameCopy.indexOf(UNDERSCORE, i+1);
-    }
-    char[] cArray = new char[classNameCopy.length()];
-    boolean foundDigit = false;
-    for (int j = 0; j < cArray.length; j++)
-    {
-      char c = classNameCopy.charAt(j);
-      if (Character.isDigit(c))
-      {
-        cArray[j] = c;
-        foundDigit = true;
-      }
-      else
-      {
-        if (foundDigit)
-          cArray[j] = Character.toUpperCase(c);
-        else
-          cArray[j] = c;
-        foundDigit = false;
-      }
-    }
-    return new String(cArray);
-  }
-
-  /**
-  * Returns the javaWSDLParam.
-  * @return JavaWSDLParameter
-  */
-  public JavaWSDLParameter getJavaWSDLParam()
-  {
-    return javaWSDLParam_;
-  }
-
-  /**
-  * Sets the javaWSDLParam.
-  * @param javaWSDLParam The javaWSDLParam to set
-  */
-  public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam)
-  {
-    javaWSDLParam_ = javaWSDLParam;
-  }
-  /**
-   * @return Returns the webServicesParser.
-   */
-  public WebServicesParser getWebServicesParser() {
-    return webServicesParser;
-  }
-
-  /**
-   * @param webServicesParser The webServicesParser to set.
-   */
-  public void setWebServicesParser(WebServicesParser webServicesParser) {
-    this.webServicesParser = webServicesParser;
-  }
-
-
-  /**
-   * @param discoveredWsdlPortElementName The discoveredWsdlPortElementName to set.
-   */
-  public void setDiscoveredWsdlPortElementName(String discoveredWsdlPortElementName) {
-    this.discoveredWsdlPortElementName = discoveredWsdlPortElementName;
-  }
-
-  /**
-	* @param clientProject The clientProject to set.
-	*/
-  public void setClientProject(IProject clientProject) {
-		this.clientProject_ = clientProject;
-  }
-	
-	/**
-	 * @return Returns the proxyBean.
-	 */
-	public String getProxyBean() {
-		return proxyBean_;
-	}	
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/Stub2BeanInfo.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/Stub2BeanInfo.java
deleted file mode 100644
index 7037c9a..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/Stub2BeanInfo.java
+++ /dev/null
@@ -1,671 +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.ui.task;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.StringWriter;
-import java.io.Writer;
-import java.util.Iterator;
-import java.util.List;
-import java.util.StringTokenizer;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jem.internal.plugin.JavaEMFNature;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.JavaParameter;
-import org.eclipse.jem.java.JavaVisibilityKind;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jem.java.impl.JavaClassImpl;
-import org.eclipse.jem.util.emf.workbench.JavaProjectUtilities;
-import org.eclipse.jst.ws.internal.axis.consumption.util.WSDLUtils;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.wst.command.env.common.FileResourceUtils;
-import org.eclipse.wst.command.env.core.common.ProgressMonitor;
-import org.eclipse.wst.command.env.core.common.StatusHandler;
-
-public class Stub2BeanInfo
-{
-  private final String NEW_LINE = System.getProperty("line.separator");
-
-  private int indentCount;
-
-  private String package_;
-  private StringBuffer imports_;
-  private StringBuffer seis_;
-  private StringBuffer services_;
-  private StringBuffer jndiNames_;
-  private StringBuffer ports_;
-  private String class_;
-  private Vector usedNames;
-  
-  private IProject clientProject_;
-
-  public Stub2BeanInfo()
-  {
-    indentCount = 0;
-    package_ = null;
-    imports_ = new StringBuffer();
-    seis_ = new StringBuffer();
-    services_ = new StringBuffer();
-    jndiNames_ = new StringBuffer();
-    ports_ = new StringBuffer();
-    class_ = "SEIBean";
-    usedNames = new Vector();
-  }
-
-  public void setClientProject(IProject clientProject) {
-  	this.clientProject_ =  clientProject;
-  }
-  
-
-  public void setPackage(String pkgName)
-  {
-    if (pkgName != null && pkgName.length() > 0)
-      package_ = manglePackageName(pkgName);
-  }
-
-  public void addImports(String pkgName, String className)
-  {
-    imports_.append(toFullyQualifiedClassName(pkgName, className));
-    imports_.append(";");
-  }
-
-  public void addSEI(String seiPkgName, String seiClassName, String servicePkgName, String serviceClassName, String portName)
-  {
-    addSEI(seiPkgName, seiClassName, servicePkgName, serviceClassName, serviceClassName, portName);
-  }
-
-  public void addSEI(String seiPkgName, String seiClassName, String servicePkgName, String serviceClassName, String jndiName, String portName)
-  {
-    seis_.append(toFullyQualifiedClassName(seiPkgName, seiClassName));
-    seis_.append(";");
-    services_.append(toFullyQualifiedClassName(servicePkgName, serviceClassName));
-    services_.append(";");
-    jndiNames_.append(jndiName);
-    jndiNames_.append(";");
-    ports_.append(portName);
-    ports_.append(";");
-  }
-
-  public void setClass(String className)
-  {
-    if (className != null && className.length() > 0)
-      class_ = mangleClassName(className);
-  }
-
-  private String toFullyQualifiedClassName(String pkgName, String className)
-  {
-    StringBuffer sb = new StringBuffer();
-    sb.append(manglePackageName(pkgName));
-    sb.append(".");
-    sb.append(mangleClassName(className));
-    return sb.toString();
-  }
-
-  private String getPackageName(String qname)
-  {
-    int index = qname.lastIndexOf(".");
-    if (index != -1)
-      return qname.substring(0, index);
-    else
-      return qname;
-  }
-
-  private String getClassName(String qname)
-  {
-    int index = qname.lastIndexOf(".");
-    if (index != -1)
-      return qname.substring(index+1, qname.length());
-    else
-      return qname;
-  }
-
-  private String manglePackageName(String s)
-  {
-    return replaceInvalidJavaChars(s);
-  }
-
-  private String mangleClassName(String s)
-  {
-    s = firstCharToUpperCase(WSDLUtils.resolveDotInPortName(s));
-    return replaceInvalidJavaChars(s);
-  }
-
-  private String replaceInvalidJavaChars(String s)
-  {
-    char[] c = s.toCharArray();
-    for (int i = 0; i < c.length; i++)
-    {
-      if (!Character.isJavaIdentifierPart(c[i]))
-        c[i] = '.';
-    }
-    return new String(c);
-  }
-
-  private String firstCharToUpperCase(String s)
-  {
-    StringBuffer sb = new StringBuffer();
-    sb.append(s.substring(0, 1).toUpperCase());
-    sb.append(s.substring(1, s.length()));
-    return sb.toString();
-  }
-
-  private String firstCharToLowerCase(String s)
-  {
-    StringBuffer sb = new StringBuffer();
-    sb.append(s.substring(0, 1).toLowerCase());
-    sb.append(s.substring(1, s.length()));
-    return sb.toString();
-  }
-
-  private String trimArraySymbol(String s)
-  {
-    int index = s.indexOf("[");
-    if (index != -1)
-      return s.substring(0, index);
-    else
-      return s;
-  }
-
-  private String getFullyQualifiedName(JavaHelpers javaHelpers)
-  {
-    if (javaHelpers.isPrimitive())
-      return javaHelpers.getJavaName();
-    else
-      return javaHelpers.getQualifiedName();
-  }
-
-  public void write(ProgressMonitor progressMonitor, StatusHandler statusMonitor) throws CoreException, IOException
-  {
-    StringWriter sw = new StringWriter(2048);
-    writePackage(sw);
-    writeImports(sw);
-    writeClass(sw);
-    sw.close();
-    byte[] bytes = sw.getBuffer().toString().getBytes();
-    StringBuffer sb = new StringBuffer();
-    if (package_ != null && package_.length() > 0)
-    {
-      sb.append(package_);
-      sb.append(".");
-    }
-    sb.append(class_);
-    sb = new StringBuffer(sb.toString().replace('.', '/'));
-    sb.append(".java");
-//    WebServiceElement wse = WebServiceElement.getWebServiceElement(model_);
-//    IProject clientProject = wse.getProxyProject();
-    JavaEMFNature javaMOF = (JavaEMFNature)JavaEMFNature.createRuntime(clientProject_);
-    ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
-    FileResourceUtils.createFile(WebServicePlugin.getInstance().getResourceContext(), JavaProjectUtilities.getSourceFolderOrFirst(javaMOF.getProject(), null).getFile(new Path(sb.toString())).getFullPath(), bais, progressMonitor, statusMonitor);
-  }
-
-  private void writePackage(Writer w) throws IOException
-  {
-    if (package_ != null && package_.length() > 0)
-    {
-      w.write("package ");
-      w.write(package_);
-      w.write(";");
-      newLine(w);
-    }
-  }
-
-  private void writeImports(Writer w) throws IOException
-  {
-    StringTokenizer st = new StringTokenizer(imports_.toString(), ";");
-    while (st.hasMoreTokens())
-    {
-      w.write("import ");
-      w.write(st.nextToken());
-      w.write(";");
-      newLine(w);
-    }
-  }
-
-  private void writeClass(Writer w) throws IOException, CoreException
-  {
-    newLine(w);
-    w.write("public class ");
-    w.write(class_);
-    w.write(" ");
-    StringTokenizer st = new StringTokenizer(seis_.toString(), ";");
-    if (st.hasMoreTokens())
-      w.write("implements ");
-    while (st.hasMoreTokens())
-    {
-      w.write(st.nextToken());
-      if (st.hasMoreTokens())
-        w.write(", ");
-    }
-    w.write(" {");
-    incrementIndent();
-    newLine(w);
-    writeFieldsDeclarations(w);
-    writeConstructor(w);
-    writeInit(w);
-    /*
-    * Cannot use JNDI lookup for AXIS
-    *
-    writeUseJNDI(w);
-    */
-    writeGetSetEndpoint(w);
-    writeSEIGetters(w);
-    writeSEIMethods(w);
-    decrementIndent();
-    newLine(w);
-    w.write("}");
-  }
-
-  private void writeFieldsDeclarations(Writer w) throws IOException
-  {
-    /*
-    * Cannot use JNDI lookup for AXIS
-    *
-    w.write("private boolean _useJNDI = true;");
-    newLine(w);
-    */
-    w.write("private String _endpoint = null;");
-    usedNames.add("_endpoint");
-    newLine(w);
-    StringTokenizer st = new StringTokenizer(seis_.toString(), ";");
-    while (st.hasMoreTokens())
-    {
-      w.write("private ");
-      String sei = st.nextToken();
-      w.write(sei);
-      w.write(" ");
-      String stubName = firstCharToLowerCase(getClassName(sei));
-      w.write(stubName);
-      usedNames.add(stubName);
-      w.write(" = null;");
-      newLine(w);
-    }
-  }
-
-  private void writeConstructor(Writer w) throws IOException
-  {
-    newLine(w);
-    w.write("public ");
-    w.write(class_);
-    w.write("() {");
-    incrementIndent();
-    newLine(w);
-    w.write("_init");
-    w.write(class_);
-    w.write("();");
-    decrementIndent();
-    newLine(w);
-    w.write("}");
-    newLine(w);
-  }
-
-  private void writeInit(Writer w) throws IOException
-  {
-    newLine(w);
-    w.write("private void _init");
-    w.write(class_);
-    w.write("() {");
-    incrementIndent();
-    newLine(w);
-    w.write("try {");
-    incrementIndent();
-    newLine(w);
-    /*
-    * Cannot use JNDI lookup for AXIS
-    *
-    w.write("if (_useJNDI) {");
-    incrementIndent();
-    newLine(w);
-    */
-    StringTokenizer st = new StringTokenizer(seis_.toString(), ";");
-    StringTokenizer serviceTokens = new StringTokenizer(services_.toString(), ";");
-    StringTokenizer jndiNameTokens = new StringTokenizer(jndiNames_.toString(), ";");
-    StringTokenizer portTokens = new StringTokenizer(ports_.toString(), ";");
-    /*
-    if (st.hasMoreTokens())
-    {
-      w.write("javax.naming.InitialContext ctx = new javax.naming.InitialContext();");
-      newLine(w);
-    }
-    while (st.hasMoreTokens())
-    {
-      w.write(firstCharToLowerCase(getClassName(st.nextToken())));
-      w.write(" = ((");
-      w.write(serviceTokens.nextToken());
-      w.write(")ctx.lookup(\"java:comp/env/service/");
-      w.write(jndiNameTokens.nextToken());
-      w.write("\")).get");
-      w.write(mangleClassName(portTokens.nextToken()));
-      w.write("();");
-      newLine(w);
-    }
-    decrementIndent();
-    newLine(w);
-    w.write("}");
-    newLine(w);
-    w.write("else {");
-    incrementIndent();
-    newLine(w);
-    st = new StringTokenizer(seis_.toString(), ";");
-    serviceTokens = new StringTokenizer(services_.toString(), ";");
-    portTokens = new StringTokenizer(ports_.toString(), ";");
-    */
-    while (st.hasMoreTokens())
-    {
-      String seiName = firstCharToLowerCase(getClassName(st.nextToken()));
-      w.write(seiName);
-      w.write(" = (new ");
-      w.write(serviceTokens.nextToken());
-      w.write("Locator()).get");
-      w.write(replaceInvalidJavaChars(WSDLUtils.resolveDotInPortName(portTokens.nextToken())));
-      w.write("();");
-      newLine(w);
-      w.write("if (");
-      w.write(seiName);
-      w.write(" != null) {");
-      incrementIndent();
-      newLine(w);
-      w.write("if (_endpoint != null)");
-      incrementIndent();
-      newLine(w);
-      w.write("((javax.xml.rpc.Stub)");
-      w.write(seiName);
-      w.write(")._setProperty(\"javax.xml.rpc.service.endpoint.address\", _endpoint);");
-      decrementIndent();
-      newLine(w);
-      w.write("else");
-      incrementIndent();
-      newLine(w);
-      w.write("_endpoint = (String)((javax.xml.rpc.Stub)");
-      w.write(seiName);
-      w.write(")._getProperty(\"javax.xml.rpc.service.endpoint.address\");");
-      decrementIndent();
-      decrementIndent();
-      newLine(w);
-      w.write("}");
-      newLine(w);
-    }
-    /*
-    decrementIndent();
-    newLine(w);
-    w.write("}");
-    */
-    decrementIndent();
-    newLine(w);
-    w.write("}");
-    newLine(w);
-    /*
-    w.write("catch (javax.naming.NamingException namingException) {}");
-    newLine(w);
-    */
-    w.write("catch (javax.xml.rpc.ServiceException serviceException) {}");
-    decrementIndent();
-    newLine(w);
-    w.write("}");
-    newLine(w);
-  }
-
-  private void writeSetPropertyEndpoint(Writer w) throws IOException
-  {
-    StringTokenizer st = new StringTokenizer(seis_.toString(), ";");
-    while (st.hasMoreTokens())
-    {
-      String seiName = firstCharToLowerCase(getClassName(st.nextToken()));
-      w.write("if (");
-      w.write(seiName);
-      w.write(" != null)");
-      incrementIndent();
-      newLine(w);
-      w.write("((javax.xml.rpc.Stub)");
-      w.write(seiName);
-      w.write(")._setProperty(\"javax.xml.rpc.service.endpoint.address\", _endpoint);");
-      decrementIndent();
-      newLine(w);
-    }
-  }
-
-  private void writeUseJNDI(Writer w) throws IOException
-  {
-    newLine(w);
-    w.write("public void useJNDI(boolean useJNDI) {");
-    incrementIndent();
-    newLine(w);
-    w.write("_useJNDI = useJNDI;");
-    newLine(w);
-    StringTokenizer st = new StringTokenizer(seis_.toString(), ";");
-    while (st.hasMoreTokens())
-    {
-      w.write(firstCharToLowerCase(getClassName(st.nextToken())));
-      w.write(" = null;");
-      newLine(w);
-    }
-    decrementIndent();
-    newLine(w);
-    w.write("}");
-    newLine(w);
-  }
-
-  private void writeSEIGetters(Writer w) throws IOException
-  {
-    StringTokenizer st = new StringTokenizer(seis_.toString(), ";");
-    while (st.hasMoreTokens())
-    {
-      String sei = st.nextToken();
-      String seiClassName = getClassName(sei);
-      String seiFieldName = firstCharToLowerCase(seiClassName);
-      newLine(w);
-      w.write("public ");
-      w.write(sei);
-      w.write(" get");
-      w.write(seiClassName);
-      w.write("() {");
-      incrementIndent();
-      newLine(w);
-      w.write("if (");
-      w.write(seiFieldName);
-      w.write(" == null)");
-      incrementIndent();
-      newLine(w);
-      w.write("_init");
-      w.write(class_);
-      w.write("();");
-      decrementIndent();
-      newLine(w);
-      w.write("return ");
-      w.write(seiFieldName);
-      w.write(";");
-      decrementIndent();
-      newLine(w);
-      w.write("}");
-      newLine(w);
-    }
-  }
-
-  private void writeSEIMethods(Writer w) throws IOException, CoreException
-  {
-    newLine(w);
-    //WebServiceElement wse = WebServiceElement.getWebServiceElement(model_);
-    if (clientProject_ == null) return;//wse.getProxyProject();
-    JavaEMFNature javaMOF = (JavaEMFNature)JavaEMFNature.createRuntime(clientProject_);
-    StringTokenizer st = new StringTokenizer(seis_.toString(), ";");
-    while (st.hasMoreTokens())
-    {
-      String sei = st.nextToken();
-      JavaClass javaClass = (JavaClass)JavaClassImpl.reflect(getPackageName(sei), getClassName(sei), javaMOF.getResourceSet());
-      if (javaClass != null)
-      {
-        List methods = javaClass.getMethods();
-        for (Iterator it = methods.iterator(); it.hasNext();)
-        {
-          Method method = (Method)it.next();
-          if (!method.isConstructor() && !method.isNative() && method.getJavaVisibility().getValue() == JavaVisibilityKind.PUBLIC)
-            writeSEIMethods(w, javaClass, method);
-        }
-      }
-    }
-  }
-
-  private void writeSEIMethods(Writer w, JavaClass javaClass, Method method) throws IOException
-  {
-    w.write("public ");
-    // isVoid
-    if (method.isVoid())
-      w.write("void ");
-    else
-    {
-      w.write(getFullyQualifiedName(method.getReturnType()));
-      w.write(" ");
-    }
-    // method name
-    w.write(method.getName());
-    w.write("(");
-    // input parameters
-    JavaParameter[] inputParams = method.listParametersWithoutReturn();
-    for (int i = 0; i < inputParams.length; i++)
-    {
-      if (i > 0)
-        w.write(", ");
-      JavaHelpers javaHelpers = inputParams[i].getJavaType();
-      w.write(getFullyQualifiedName(javaHelpers));
-      w.write(" ");
-      String paramName = getClassName(inputParams[i].getQualifiedName());
-      w.write(getUnusedName(paramName));
-    }
-    w.write(")");
-    // exceptions
-    List exceptions = method.getJavaExceptions();
-    if (!exceptions.isEmpty())
-      w.write(" throws ");
-    for (Iterator it = exceptions.iterator(); it.hasNext();)
-    {
-      JavaClass exception = (JavaClass)it.next();
-      w.write(exception.getQualifiedNameForReflection());
-      if (it.hasNext())
-        w.write(", ");
-    }
-    // method body
-    w.write("{");
-    incrementIndent();
-    newLine(w);
-    String stubName = firstCharToLowerCase(javaClass.getName());
-    w.write("if (");
-    w.write(stubName);
-    w.write(" == null)");
-    incrementIndent();
-    newLine(w);
-    w.write("_init");
-    w.write(class_);
-    w.write("();");
-    decrementIndent();
-    newLine(w);
-    if (!method.isVoid())
-      w.write("return ");
-    w.write(stubName);
-    w.write(".");
-    w.write(method.getName());
-    w.write("(");
-    for (int i = 0; i < inputParams.length; i++)
-    {
-      if (i > 0)
-        w.write(", ");
-      String paramName = getClassName(inputParams[i].getQualifiedName());
-      w.write(getUnusedName(paramName));
-    }
-    w.write(");");
-    decrementIndent();
-    newLine(w);
-    w.write("}");
-    newLine(w);
-    newLine(w);
-  }
-
-  private void writeGetSetEndpoint(Writer w) throws IOException
-  {
-    newLine(w);
-    w.write("public String getEndpoint() {");
-    incrementIndent();
-    newLine(w);
-    w.write("return _endpoint;");
-    decrementIndent();
-    newLine(w);
-    w.write("}");
-    newLine(w);
-    newLine(w);
-    w.write("public void setEndpoint(String endpoint) {");
-    incrementIndent();
-    newLine(w);
-    w.write("_endpoint = endpoint;");
-    newLine(w);
-    writeSetPropertyEndpoint(w);
-    decrementIndent();
-    newLine(w);
-    w.write("}");
-    newLine(w);
-  }
-
-  private void createParentFolder(IResource res) throws CoreException
-  {
-    IResource parent = res.getParent();
-    if (parent != null && parent != res && parent instanceof IFolder)
-    {
-      IFolder folder = (IFolder)parent;
-      if (!folder.exists())
-      {
-        createParentFolder(folder);
-        folder.create(true, true, null);
-      }
-    }
-  }
-
-  private void incrementIndent()
-  {
-    indentCount++;
-  }
-
-  private void decrementIndent()
-  {
-    indentCount--;
-  }
-
-  private void indent(Writer w) throws IOException
-  {
-    for (int i = 0; i < indentCount; i++)
-      w.write("  ");
-  }
-
-  private void newLine(Writer w) throws IOException
-  {
-    w.write(NEW_LINE);
-    indent(w);
-  }
-  
-  private String getUnusedName(String name)
-  {
-    if (usedNames.contains(name))
-    {
-      for (int i = 0; i < 100; i++)
-      {
-        String newName = (new StringBuffer(name)).append(String.valueOf(i)).toString();
-        if (!usedNames.contains(newName))
-          return newName;
-      }
-    }
-    return name;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/ValidateWSDLCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/ValidateWSDLCommand.java
deleted file mode 100644
index 8cd77ab..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/ValidateWSDLCommand.java
+++ /dev/null
@@ -1,73 +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.axis.consumption.ui.task;
-
-import javax.wsdl.Definition;
-
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.ws.parser.wsil.WebServicesParser;
-
-
-
-public class ValidateWSDLCommand extends SimpleCommand
-{
-  private WebServicesParser webServicesParser;
-  private String wsdlURI;
-
-  public ValidateWSDLCommand()
-  {
-    super("org.eclipse.jst.ws.internal.axis.consumption.ui.task.ValidateWSDLCommand", "org.eclipse.jst.ws.internal.axis.consumption.ui.task.ValidateWSDLCommand");
-  }
-
-  public Status execute(Environment env)
-  {
-	MessageUtils msgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.ui.plugin", this );
-	
-    if (wsdlURI != null && wsdlURI.length() > 0)
-    {
-      Definition definition = webServicesParser.getWSDLDefinition(wsdlURI);
-      if (definition != null)
-      {
-        int numServices = definition.getServices().size();
-        if (numServices < 1)
-        {
-          Status status = new SimpleStatus(WebServiceConsumptionUIPlugin.ID, msgUtils_.getMessage("MSG_ERROR_WSDL_HAS_NO_SERVICE_ELEMENT", new Object[] {wsdlURI}), Status.ERROR, null);
-          env.getStatusHandler().reportError(status);
-          return status;
-        }
-      }
-    }
-    return new SimpleStatus("");
-  }
-
-  /**
-   * @param wsdlURI The wsdlURI to set.
-   */
-  public void setWsdlURI(String wsdlURI)
-  {
-    this.wsdlURI = wsdlURI;
-  }
-
-  /**
-   * @param webServicesParser The webServicesParser to set.
-   */
-  public void setWebServicesParser(WebServicesParser webServicesParser)
-  {
-    this.webServicesParser = webServicesParser;
-  }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisClientCommandsFragment.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisClientCommandsFragment.java
deleted file mode 100644
index 5769346..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisClientCommandsFragment.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 Eclipse Public License v1.0
- * which accompanies 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.ui.widgets;
-
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.WSDL2JavaCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.command.DefaultsForClientJavaWSDLCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.AddJarsToProjectBuildPathTask;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.CopyAxisJarCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.DefaultsForHTTPBasicAuthCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.RefreshProjectCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.Stub2BeanCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.ValidateWSDLCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.BuildProjectCommand;
-import org.eclipse.wst.command.env.core.common.Condition;
-import org.eclipse.wst.command.env.core.fragment.BooleanFragment;
-import org.eclipse.wst.command.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.env.core.fragment.SimpleFragment;
-
-
-public class AxisClientCommandsFragment extends BooleanFragment
-{
-  private boolean genProxy_;
-  
-  public AxisClientCommandsFragment()
-  {
-    SequenceFragment root = new SequenceFragment();
-    
-    root.add(new SimpleFragment(new DefaultsForHTTPBasicAuthCommand(), ""));
-    root.add(new SimpleFragment(new CopyAxisJarCommand(), ""));
-    root.add(new SimpleFragment(new AddJarsToProjectBuildPathTask(), ""));
-    root.add(new SimpleFragment(new DefaultsForClientJavaWSDLCommand(), "")); 
-    root.add(new SimpleFragment(new ValidateWSDLCommand(), ""));
-    root.add(new SimpleFragment(new WSDL2JavaCommand(), "")); 
-    root.add(new SimpleFragment(new RefreshProjectCommand(), ""));
-    root.add(new SimpleFragment(new Stub2BeanCommand(), ""));
-    root.add(new SimpleFragment(new BuildProjectCommand(), ""));
-    
-    setCondition( new Condition()
-                  {
-                    public boolean evaluate()
-                    {
-                      return genProxy_;
-                    }
-                  });
-    setTrueFragment( root );
-  }
-  
-  public void setGenerateProxy( boolean genProxy )
-  {
-    genProxy_ = genProxy;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisClientFragment.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisClientFragment.java
deleted file mode 100644
index e457399..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisClientFragment.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.axis.consumption.ui.widgets;
-
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.WSDL2JavaCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.command.AxisClientDefaultingCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.command.DefaultsForClientJavaWSDLCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.AddJarsToProjectBuildPathTask;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.CopyAxisJarCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.DefaultsForHTTPBasicAuthCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.RefreshProjectCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.Stub2BeanCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.ValidateWSDLCommand;
-import org.eclipse.jst.ws.internal.common.StringToIProjectTransformer;
-import org.eclipse.jst.ws.internal.consumption.command.common.BuildProjectCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ClientExtensionDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ClientExtensionOutputCommand;
-import org.eclipse.wst.command.env.core.common.Condition;
-import org.eclipse.wst.command.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.env.core.fragment.BooleanFragment;
-import org.eclipse.wst.command.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.env.core.fragment.SimpleFragment;
-
-
-public class AxisClientFragment extends SequenceFragment 
-{
-
-	public AxisClientFragment() 
-	{
-		add(new SimpleFragment(new AxisClientDefaultingCommand(), ""));
-		add(new SimpleFragment("AxisClientStart"));
-		add(new MappingFragment());
-		add(new AxisClientCommandsFragment());
-		// TODO: Look into AddWSDLtoWSILCommand for the client scenario
-	}
-	
-	public void registerDataMappings(DataMappingRegistry registry) 
-	{
-		// AxisClientDefaultingCommand
-		registry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProject", AxisClientDefaultingCommand.class, "ClientProject",
-				new StringToIProjectTransformer());
-		registry.addMapping(ClientExtensionDefaultingCommand.class, "ClientRuntime", AxisClientDefaultingCommand.class, "ClientRuntimeID",
-				null);
-		registry.addMapping(ClientExtensionDefaultingCommand.class, "WebServicesParser", AxisClientDefaultingCommand.class);
-		registry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProjectEAR", AxisClientDefaultingCommand.class,
-				"ClientProjectEAR", new StringToIProjectTransformer());
-		registry.addMapping(ClientExtensionDefaultingCommand.class, "WsdlURI", AxisClientDefaultingCommand.class, "WsdlURL", null); // URI
-																																	// to
-		// URL
-		// transformer
-		// req'd??
-		registry.addMapping(ClientExtensionDefaultingCommand.class, "TestProxySelected", AxisClientDefaultingCommand.class,
-				"TestProxySelected", null);
-		registry.addMapping(ClientExtensionDefaultingCommand.class, "ClientServer", AxisClientDefaultingCommand.class);
-		registry.addMapping(ClientExtensionDefaultingCommand.class, "IsClientScenario", AxisClientDefaultingCommand.class);
-		registry.addMapping(ClientExtensionDefaultingCommand.class, "GenerateProxy", AxisClientDefaultingCommand.class);
-		// DefaultsForHTTPBasicAuthCommand()
-		registry.addMapping(AxisClientDefaultingCommand.class, "JavaWSDLParam", DefaultsForHTTPBasicAuthCommand.class); //OK
-		registry.addMapping(AxisClientDefaultingCommand.class, "WsdlURL", DefaultsForHTTPBasicAuthCommand.class, "WsdlServiceURL", null); //OK
-		registry.addMapping(AxisClientDefaultingCommand.class, "WebServicesParser", DefaultsForHTTPBasicAuthCommand.class); //OK
-	    registry.addMapping(AxisClientDefaultingCommand.class, "CustomizeClientMappings", MappingFragment.class );    
-		//registry.addMapping(AxisClientDefaultingCommand.class,
-		// "ServiceProject",
-		// CreateWebProjectCommand.class);
-		//registry.addMapping(AxisClientDefaultingCommand.class,
-		// "EJBProjectName",
-		// CreateWebProjectCommand.class);
-		// CopyAxisJarCommand()
-		registry.addMapping(AxisClientDefaultingCommand.class, "ClientProject", CopyAxisJarCommand.class, "Project", null);
-		// AddJarsToProjectBuildPathTask()
-		registry.addMapping(AxisClientDefaultingCommand.class, "ClientProject", AddJarsToProjectBuildPathTask.class, "Project", null);
-		// DefaultsForClientJavaWSDLCommand() // javaParam_, model_
-		registry.addMapping(AxisClientDefaultingCommand.class, "JavaWSDLParam", DefaultsForClientJavaWSDLCommand.class);
-		registry.addMapping(AxisClientDefaultingCommand.class, "ClientProject", DefaultsForClientJavaWSDLCommand.class, "ProxyProject",
-				null);
-		//		registry.addMapping(AxisClientDefaultingCommand.class, "WsdlURL",
-		// DefaultsForClientJavaWSDLCommand.class,"WSDLServicePathname",null);
-		// //
-		// URL to URL??
-		registry.addMapping(AxisClientDefaultingCommand.class, "WsdlURL", DefaultsForClientJavaWSDLCommand.class, "WSDLServiceURL", null); // URI
-		// to
-		// URL??
-		// ValidateWSDLCommand()
-		registry.addMapping(AxisClientDefaultingCommand.class, "JavaWSDLParam", ValidateWSDLCommand.class);
-		registry.addMapping(AxisClientDefaultingCommand.class, "WsdlServiceURL", ValidateWSDLCommand.class);
-		registry.addMapping(AxisClientDefaultingCommand.class, "WebServicesParser", ValidateWSDLCommand.class);
-		// WSDL2JavaCommand() // javaParam_
-		registry.addMapping(AxisClientDefaultingCommand.class, "JavaWSDLParam", WSDL2JavaCommand.class);
-		registry.addMapping(AxisClientDefaultingCommand.class, "WsdlURL", WSDL2JavaCommand.class, "WsdlURI", null); // URL
-																													// to
-																													// URI??
-		// RefreshProjectCommand()
-		registry.addMapping(AxisClientDefaultingCommand.class, "ClientProject", RefreshProjectCommand.class, "Project", null);
-		// Stub2BeanCommand()
-		registry.addMapping(AxisClientDefaultingCommand.class, "JavaWSDLParam", Stub2BeanCommand.class);
-		registry.addMapping(AxisClientDefaultingCommand.class, "WebServicesParser", Stub2BeanCommand.class);
-		registry.addMapping(AxisClientDefaultingCommand.class, "ClientProject", Stub2BeanCommand.class);
-		// BuildProjectCommand()
-		registry.addMapping(AxisClientDefaultingCommand.class, "ClientProject", BuildProjectCommand.class, "Project", null);
-		registry.addMapping(AxisClientDefaultingCommand.class, "ForceBuild", BuildProjectCommand.class);
-		registry.addMapping(AxisClientDefaultingCommand.class, "ValidationManager", BuildProjectCommand.class);
-		registry.addMapping(Stub2BeanCommand.class, "ProxyBean", ClientExtensionOutputCommand.class, "ProxyBean", null);
-		registry.addMapping(AxisClientDefaultingCommand.class, "GenerateProxy", AxisClientCommandsFragment.class);
-		registry.addMapping(AxisClientDefaultingCommand.class, "GenerateProxy", ClientExtensionOutputCommand.class);
-		registry.addMapping(AxisClientDefaultingCommand.class, "SetEndpointMethod", ClientExtensionOutputCommand.class);
-	}
-
-	public class MappingFragment extends BooleanFragment {
-
-		private boolean showMappings_;
-		public MappingFragment() {
-
-			super();
-			setTrueFragment(new SimpleFragment("AxisClientBeanMapping"));
-			setCondition(new Condition() {
-
-				public boolean evaluate() {
-
-					return showMappings_;
-				}
-			});
-		}
-		public void setCustomizeClientMappings(boolean showMappings) {
-
-			showMappings_ = showMappings;
-		}
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisMappingsFragment.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisMappingsFragment.java
deleted file mode 100644
index ff4a66c..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisMappingsFragment.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.jst.ws.internal.axis.consumption.ui.widgets;
-
-import org.eclipse.wst.command.env.core.common.Condition;
-import org.eclipse.wst.command.env.core.fragment.BooleanFragment;
-import org.eclipse.wst.command.env.core.fragment.SimpleFragment;
-
-
-public class AxisMappingsFragment extends BooleanFragment
-{
-  private boolean showMappings_;
-
-  public AxisMappingsFragment()
-  {
-    super();
-    setTrueFragment( new SimpleFragment( "AxisMappingsWidget" ));
-    setCondition( new Condition()
-                  {
-                    public boolean evaluate()
-                    {
-                      return showMappings_;
-                    }
-                  } );
-  }
-  
-  public void setShowMapping( boolean showMappings )
-  {
-    showMappings_ = showMappings;
-  }      
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisMappingsWidget.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisMappingsWidget.java
deleted file mode 100644
index 83525ea..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisMappingsWidget.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 Eclipse Public License v1.0
- * which accompanies 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.ui.widgets;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.TableViewerWidget;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.command.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.env.ui.widgets.WidgetDataEvents;
-
-
-public class AxisMappingsWidget extends SimpleWidgetDataContributor
-{
-  private String pluginId_ = "org.eclipse.jst.ws.axis.consumption.ui";
-  
-  private TableViewerWidget mappings_;
-
-  private byte mode_;
-  private JavaWSDLParameter javaParameter_;
-
-  public static final byte MODE_BEAN2XML = (byte)0;
-  public static final byte MODE_XML2BEAN = (byte)1;
-  public static final byte MODE_XML2PROXY = (byte)2;
-  public static final byte MODE_XML2EJB = (byte)3;
-  public static final byte MODE_EJB2XML = (byte)4;
-  
-  private final String DEFAULT_PACKAGE = "default.javapackage";
-  private final String DEFAULT_NAMESPACE = "http://default.namespace";
-  
-  /*CONTEXT_ID PWJM0001 for the WSDL to Java Mappings Page*/
-  private String INFOPOP_PWJM_PAGE = "PWJM0001"; //$NON-NLS-1$
-  
-  public AxisMappingsWidget( byte mode )
-  {
-    mode_ = mode;
-  }
-  
-  public WidgetDataEvents addControls( Composite parent, Listener statusListener )
-  {
-    MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
-    UIUtils      uiUtils  = new UIUtils(msgUtils, pluginId_ );
-        
-    // TODO The TOOLTIP_PWJM_PAGE key doesn't seem to exist anywhere???
-	//parent.setToolTipText( msgUtils.getMessage( "TOOLTIP_PWJM_PAGE" ) );
-    PlatformUI.getWorkbench().getHelpSystem().setHelp( parent, pluginId_ + "." + INFOPOP_PWJM_PAGE );
-    
-    // TODO No tooltip or infopop for this group.
-    Group mappingGroup = uiUtils.createGroup( parent, "LABEL_MAPPING_PAIRS", null, null );
-                                               
-    List initValues = new ArrayList();
-    
-    if( mode_ == MODE_BEAN2XML || mode_ == MODE_EJB2XML) 
-    {
-		String[] columns = { msgUtils.getMessage("TABLE_COLUMN_LABEL_PACKAGE"),
-		                     msgUtils.getMessage("TABLE_COLUMN_LABEL_NAMESPACE" )};
-		mappings_ = new TableViewerWidget( columns, initValues, new String[] {DEFAULT_PACKAGE, DEFAULT_NAMESPACE}, TableViewerWidget.MAP_ONE_TO_ONE); //$NON-NLS-1$
-    }
-	else 
-	{
-      	String[] columns = { msgUtils.getMessage("TABLE_COLUMN_LABEL_NAMESPACE"),
-		                     msgUtils.getMessage("TABLE_COLUMN_LABEL_PACKAGE")};
-		mappings_ = new TableViewerWidget( columns, initValues, new String[] {DEFAULT_NAMESPACE, DEFAULT_PACKAGE }, TableViewerWidget.MAP_MANY_TO_ONE); //$NON-NLS-1$
-	}
-    
-	mappings_.addControls( mappingGroup, statusListener );
-   
-    return this;
-  }
-  
-  public Status getStatus()
-  {
-    return mappings_.getStatus();  
-  }
-  
-  public void setJavaParameter( JavaWSDLParameter parameter )
-  {
-    javaParameter_ = parameter;
-  }
-  
-  public JavaWSDLParameter getJavaParameter()
-  {
-    if( mode_ == MODE_BEAN2XML || mode_ == MODE_EJB2XML || mode_ == MODE_XML2BEAN || mode_ == MODE_XML2PROXY)
-    {
-      //Set the mappings on javaParameter
-      TableItem[] pairs = mappings_.getItems();
-  	  HashMap map = new HashMap();
-  	  for (int i=0; i<pairs.length; i++)
-  	  {
-  		map.put(pairs[i].getText(0),pairs[i].getText(1));
-  	  }
-  	  javaParameter_.setMappings(map);
-  	  
-  	  //Set the namespace on the javaParameter
-  	  String beanName = javaParameter_.getBeanName();
-	  if(beanName != null && !beanName.equals(""))
-	  {
-		String packageName = beanName.substring(0, beanName.lastIndexOf('.'));
-		if(map.containsKey(packageName))
-		{
-		  String tns = (String)map.get(packageName);
-		  javaParameter_.setNamespace(tns);
-		}		
-	  }
-
-    }
-    return javaParameter_;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisProxyWidget.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisProxyWidget.java
deleted file mode 100644
index 7240cbe..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisProxyWidget.java
+++ /dev/null
@@ -1,130 +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.axis.consumption.ui.widgets;
-
-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.Composite;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.env.ui.widgets.WidgetDataEvents;
-
-
-public class AxisProxyWidget extends SimpleWidgetDataContributor
-{
-  private String pluginId_ = "org.eclipse.jst.ws.axis.consumption.ui";
-  
-  /*CONTEXT_ID PWJB0001 for the WSDL to Java Bindings Page*/
-  private final String INFOPOP_PWJB_PAGE = "PWJB0001";	//$NON-NLS-1$
-  private final String TOOLTIP_PWJB_PAGE = "TOOLTIP_PWJB_PAGE";
-		
-  private Text folderText_;
-  /*CONTEXT_ID PWJB0003 for the Folder field of the WSDL to Java Bindings Page*/
-  private final String INFOPOP_PWJB_TEXT_FOLDER = "PWJB0003";	//$NON-NLS-1$
-  private final String TOOLTIP_PWJB_TEXT_FOLDER = "TOOLTIP_PWJB_TEXT_FOLDER";
-
-  private Button genProxyCheckbox_;
-  /*CONTEXT_ID PWJB0009 Indicates whether to generate a proxy or not. */
-  private final String INFOPOP_PWJB_CHECKBOX_GENPROXY = "PWJB0009";	//$NON-NLS-1$
-  private final String TOOLTIP_PWJB_CHECKBOX_GENPROXY = "TOOLTIP_PWJB_CHECKBOX_GENPROXY";
-		
-  private Button showMappingsCheckbox_;
-  /*CONTEXT_ID PWJB0016 for the Show Mappings checkbox of the Bean Methods Page*/
-  private String INFOPOP_N2P_SHOW_MAPPINGS = "PWJB0016"; //$NON-NLS-1$
-  
-  public WidgetDataEvents addControls( Composite parent, Listener statusListener )
-  {
-    MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
-    UIUtils      uiUtils  = new UIUtils(msgUtils, pluginId_ );
-    
-	parent.setToolTipText( msgUtils.getMessage( TOOLTIP_PWJB_PAGE ) );
-	PlatformUI.getWorkbench().getHelpSystem().setHelp( parent, pluginId_ + "." +  INFOPOP_PWJB_PAGE);
-    
-    genProxyCheckbox_ = uiUtils.createCheckbox( parent, "CHECKBOX_GENPROXY",
-                                                TOOLTIP_PWJB_CHECKBOX_GENPROXY,
-                                                INFOPOP_PWJB_CHECKBOX_GENPROXY );
-    genProxyCheckbox_.addListener( SWT.Selection, statusListener );
-    
-    genProxyCheckbox_.addSelectionListener( new SelectionAdapter()
-                                            {
-                                              public void widgetSelected( SelectionEvent evt )
-                                              {
-                                                handleGenProxy();  
-                                              }
-                                            });
-    
-    Composite textGroup = uiUtils.createComposite( parent, 2, 5, 0 );
-    
-    folderText_ = uiUtils.createText( textGroup, "LABEL_FOLDER_NAME",
-                                      TOOLTIP_PWJB_TEXT_FOLDER,
-                                      INFOPOP_PWJB_TEXT_FOLDER,
-                                      SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
-    folderText_.addListener( SWT.Modify, statusListener );
-    
-    showMappingsCheckbox_ = uiUtils.createCheckbox( parent, "LABEL_EXPLORE_MAPPINGS_XML2BEAN",
-                                                    "TOOLTIP_N2P_SHOW_MAPPINGS",
-                                                    INFOPOP_N2P_SHOW_MAPPINGS );
-    // Since this widget affects whether the next page is shown or not we
-    // need to add the statusListener.
-    showMappingsCheckbox_.addListener( SWT.Selection, statusListener );
-    
-    return this;
-  }
-  
-  private void handleGenProxy()
-  {
-    boolean enabled = genProxyCheckbox_.getSelection();
-    
-    folderText_.setEnabled( enabled );
-    showMappingsCheckbox_.setEnabled( enabled );
-  }
-  
-  public void setProxyFolder( String proxyFolder )
-  {
-    folderText_.setText( proxyFolder );  
-  }
-  
-  public String getProxyFolder()
-  {
-     return folderText_.getText();  
-  }
-  
-  public void setGenerateProxy( Boolean genProxy )
-  {
-    genProxyCheckbox_.setSelection( genProxy.booleanValue() );
-  }    
-  
-  public Boolean getGenerateProxy()
-  {
-    return new Boolean( genProxyCheckbox_.getSelection() );
-  }   
-  
-  public void setCustomizeClientMappings( boolean showMappings )
-  {
-    showMappingsCheckbox_.setSelection( showMappings );
-  }            
-  
-  public boolean getCustomizeClientMappings()
-  {
-    return showMappingsCheckbox_.getSelection() && genProxyCheckbox_.getSelection();
-  }   
-  
-  public void setIsClientScenario( boolean isClientScenario )
-  {
-    genProxyCheckbox_.setEnabled( !isClientScenario ); 
-  }  
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/DefaultsForClient.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/DefaultsForClient.java
deleted file mode 100644
index a119734..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/DefaultsForClient.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.axis.consumption.ui.widgets;
-
-import org.eclipse.wst.command.env.core.SimpleCommand;
-
-public class DefaultsForClient extends SimpleCommand
-{
-  private boolean customizeMappings_ = true;
-  
-  public boolean getCustomizeClientMappings()
-  {
-    return customizeMappings_;
-  } 
-  
-  public void setCustomizeClientMappings( boolean value )
-  {
-    customizeMappings_ = value; 
-  }
-  
-  public String getProxyFolder()
-  {
-     return "/proxyproject/myfolder";  
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wizard/client/WebServiceClientAxisType.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wizard/client/WebServiceClientAxisType.java
deleted file mode 100644
index 3afaec2..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wizard/client/WebServiceClientAxisType.java
+++ /dev/null
@@ -1,120 +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.axis.consumption.ui.wizard.client;
-
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.WSDL2JavaCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.command.AxisClientDefaultingCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.command.DefaultsForClientJavaWSDLCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.DefaultsForHTTPBasicAuthCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.Stub2BeanCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.ValidateWSDLCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.widgets.AxisClientCommandsFragment;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.widgets.AxisClientFragment;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.widgets.AxisMappingsWidget;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.widgets.AxisProxyWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ClientExtensionOutputCommand;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.env.core.fragment.CommandFragmentFactory;
-import org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.env.ui.widgets.WidgetContributorFactory;
-import org.eclipse.wst.command.env.ui.widgets.WidgetRegistry;
-
-
-/**
-  * Developers who are adding web service clients into the wizard should create
-  * a class that implements this interface.  
-**/
-public class WebServiceClientAxisType implements CommandWidgetBinding 
-{
-
-	
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.env.core.data.DataMappingRegistry)
-   */
-  public void registerDataMappings(DataMappingRegistry dataRegistry) 
-  {
-  	// AxisClientDefaultingCommand  	
-    dataRegistry.addMapping( AxisClientDefaultingCommand.class, "CustomizeClientMappings", AxisProxyWidget.class );
-    dataRegistry.addMapping( AxisClientDefaultingCommand.class, "ProxyProjectFolder", AxisProxyWidget.class, "ProxyFolder", null );
-    dataRegistry.addMapping( AxisClientDefaultingCommand.class, "GenerateProxy", AxisProxyWidget.class);    
-    dataRegistry.addMapping( AxisClientDefaultingCommand.class, "IsClientScenario", AxisProxyWidget.class);    
-    dataRegistry.addMapping( AxisClientDefaultingCommand.class, "JavaWSDLParam", AxisMappingsWidget.class, "JavaParameter", null);
-    
-    // AxisProxyWidget
-    dataRegistry.addMapping( AxisProxyWidget.class, "CustomizeClientMappings", AxisClientFragment.MappingFragment.class );
-    dataRegistry.addMapping( AxisProxyWidget.class, "GenerateProxy", AxisClientCommandsFragment.class );
-    dataRegistry.addMapping( AxisProxyWidget.class, "GenerateProxy", ClientExtensionOutputCommand.class );
-    
-    //AxisMappingsWidget
-	dataRegistry.addMapping(AxisMappingsWidget.class, "JavaParameter", DefaultsForHTTPBasicAuthCommand.class, "JavaWSDLParam", null); //OK
-	dataRegistry.addMapping(AxisMappingsWidget.class, "JavaParameter", DefaultsForClientJavaWSDLCommand.class, "JavaWSDLParam", null); //OK
-	dataRegistry.addMapping(AxisMappingsWidget.class, "JavaParameter", ValidateWSDLCommand.class, "JavaWSDLParam", null); //OK
-	dataRegistry.addMapping(AxisMappingsWidget.class, "JavaParameter", WSDL2JavaCommand.class, "JavaWSDLParam", null); //OK
-	dataRegistry.addMapping(AxisMappingsWidget.class, "JavaParameter", Stub2BeanCommand.class, "JavaWSDLParam", null); //OK
-  }
-  
-  /* (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";
-    String       axisPluginId_ = "org.eclipse.jst.ws.axis.consumption.ui";
-    MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
-    MessageUtils axisMsgUtils = new MessageUtils( axisPluginId_ + ".plugin", this );
-    
-    widgetRegistry.add( "AxisClientStart", 
-        axisMsgUtils.getMessage("PAGE_TITLE_WS_AXIS_PROXY"),
-        axisMsgUtils.getMessage("PAGE_DESC_WS_AXIS_PROXY"),
-        new WidgetContributorFactory()
-        {
-          public WidgetContributor create()
-          {
-            return new AxisProxyWidget();
-          }
-        } );
-    
-    widgetRegistry.add( "AxisClientBeanMapping", 
-        axisMsgUtils.getMessage("PAGE_TITLE_WS_XML2PROXY"),
-        msgUtils.getMessage("PAGE_DESC_N2P_MAPPINGS"),
-        new WidgetContributorFactory()
-        {
-          public WidgetContributor create()
-          {
-            return new AxisMappingsWidget(AxisMappingsWidget.MODE_XML2PROXY );
-          }
-        } );
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.core.fragment.CommandFragmentFactoryFactory#create()
-   */
-  public CommandFragmentFactory create() 
-  {
-    return new CommandFragmentFactory()
-           {
-             public CommandFragment create()
-             {
-               return new AxisClientFragment(); 
-             }
-           };
-  }
-  /* (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) 
-  {
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wizard/test/TestWizardPage.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wizard/test/TestWizardPage.java
deleted file mode 100644
index 7b672e5..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wizard/test/TestWizardPage.java
+++ /dev/null
@@ -1,277 +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.axis.consumption.ui.wizard.test;
-
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.jst.j2ee.internal.webservices.WebServicesClientDataHelper;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.command.AxisClientGenerator;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-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.Text;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-
-/*
- * Add the stuff below to the properties file to make this work. 
-#
-#Test only - do not commit
-#
-wsdlURI=wsdlURI
-clientProject=clientProject
-serviceQName=serviceQName
-outputWSDLpath=outputWSDLpath
-GO=GO
-pop1=pop1
-pop2=pop2
-*/
-public class TestWizardPage extends WizardPage
-{
-  private String pluginId_= "org.eclipse.jst.ws.axis.consumption.ui";
-  private MessageUtils msgUtils_;
-  
-  private Text wsdlURIText_;
-  private Text clientProjectText_;
-  private Text serviceQNameText_;
-  private Text outputWSDLPathText_;
-  private Button goButton_;
-  private Button pop1Button_;
-  private Button pop2Button_;
-  
-  public TestWizardPage(String name)
-  {
-    super(name);
-    setTitle("Test Page");
-    setDescription("Test page description");
-  }
-  
-  public void createControl(Composite parent)
-  {
-    Composite page = new Composite(parent, SWT.NONE);
-    GridLayout gl = new GridLayout();
-    page.setLayout(gl);
-    GridData gd = new GridData(GridData.VERTICAL_ALIGN_FILL | GridData.HORIZONTAL_ALIGN_FILL);
-    page.setLayoutData(gd);
-    page.setSize(500,500);
-
-   
-	//Composite outerGroup_ = new Composite(page,SWT.H_SCROLL | SWT.V_SCROLL);
-	Composite outerGroup_ = new Composite(page,SWT.NONE);
-	GridLayout gl2 = new GridLayout();
-	gl2.numColumns = 2;
-	gl2.marginHeight = 0;
-	gl2.marginWidth = 0;
-	outerGroup_.setLayout(gl2);
-	//GridData gd2 = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
-	GridData gd2 = new GridData(GridData.FILL_BOTH);
-	outerGroup_.setLayoutData(gd2);
-	
-	msgUtils_ = new MessageUtils(pluginId_ + ".plugin", this);
-    UIUtils uiUtils = new UIUtils(msgUtils_, pluginId_);
-    
-    wsdlURIText_ = uiUtils.createText(outerGroup_,"wsdlURI","wsdlURI","wsdlURI",SWT.SINGLE|SWT.BORDER);
-    clientProjectText_ = uiUtils.createText(outerGroup_,"clientProject","clientProject","clientProject",SWT.SINGLE|SWT.BORDER);
-    serviceQNameText_ = uiUtils.createText(outerGroup_,"serviceQName","serviceQName","",SWT.SINGLE|SWT.BORDER);
-    outputWSDLPathText_ = uiUtils.createText(outerGroup_,"outputWSDLpath","outputWSDLpath","",SWT.SINGLE|SWT.BORDER);
-    goButton_ = uiUtils.createButton(SWT.PUSH,outerGroup_,"GO","GO","");
-    goButton_.addSelectionListener(new SelectionListener()
-        {
-          public void widgetSelected(SelectionEvent e)
-          {
-            handleGOPushed();
-          }
-          public void widgetDefaultSelected(SelectionEvent e)
-          {
-            handleGOPushed();
-        }
-        });
-    pop1Button_ = uiUtils.createButton(SWT.PUSH,outerGroup_,"pop1","pop1","");
-    pop1Button_.addSelectionListener(new SelectionListener()
-        {
-          public void widgetSelected(SelectionEvent e)
-          {
-            handlePop1Pushed();
-          }
-          public void widgetDefaultSelected(SelectionEvent e)
-          {
-            handlePop1Pushed();
-        }
-        });    
-    pop2Button_ = uiUtils.createButton(SWT.PUSH,outerGroup_,"pop2","pop2","");
-    pop2Button_.addSelectionListener(new SelectionListener()
-        {
-          public void widgetSelected(SelectionEvent e)
-          {
-            handlePop2Pushed();
-          }
-          public void widgetDefaultSelected(SelectionEvent e)
-          {
-            handlePop2Pushed();
-        }
-        });    
- 
-    setControl(page);
-  }
-  
-  private void handlePop1Pushed()
-  {
-    wsdlURIText_.setText("http://www.xmethods.net/sd/2001/TemperatureService.wsdl");
-    clientProjectText_.setText("cwp");
-    serviceQNameText_.setText("http://www.xmethods.net/sd/TemperatureService.wsdl:TemperatureService");
-    outputWSDLPathText_.setText("/cwp/Web Content/WEB-INF/wsdl/TemperatureService.wsdl");
-  }
-  
-  private void handlePop2Pushed()
-  {
-    wsdlURIText_.setText("file:/D:/Eclipse/eclipse/runtime-workspace_t1/wp2/Web Content/Converters.wsdl");
-    clientProjectText_.setText("cwp2");
-    serviceQNameText_.setText("http://sample.converters:ConvertDistanceService");
-    outputWSDLPathText_.setText("/cwp2/Web Content/WEB-INF/wsdl/Converters.wsdl");
-  }
-
-  private void handleGOPushed()
-  {
-    AxisClientGenerator generator = new AxisClientGenerator();
-    TestWSCDataHelper dataModel = new TestWSCDataHelper();
-    dataModel.populate(wsdlURIText_.getText(), serviceQNameText_.getText(), clientProjectText_.getText(), outputWSDLPathText_.getText(),false);
-    
-    generator.genWebServiceClientArtifacts(dataModel);
-    System.out.println("Generated service interface= "+dataModel.getServiceInterfaceName());
-    String[] seis = dataModel.getServiceEndpointInterfaceNames();
-    System.out.println("Generated service endpoint interfaces:");
-    for (int i=0;i<seis.length;i++)
-    {
-    	System.out.println(seis[i]);
-    }
-    System.out.println("Touched descriptors? "+dataModel.shouldGenDescriptors());
-  }
-  
-  private class TestWSCDataHelper implements WebServicesClientDataHelper
-  {
-  	private String wsdlUrl_;
-  	private String serviceQName_;
-  	private String projectName_;
-  	private String outputWSDLFileName_;
-  	private String serviceInterfaceName_;
-  	private String[] serviceEndpointInterfaceNames_;
-  	private boolean shouldDeploy_;
-  	private boolean shouldGenDescriptors_;
-  	
-  	public void populate(String wsdlURL, String serviceQName, String projectName, String outputWSDLFileName, boolean shouldDeploy)
-  	{
-  		wsdlUrl_ = wsdlURL;
-  		serviceQName_ = serviceQName;
-  		projectName_ = projectName;
-  		outputWSDLFileName_ = outputWSDLFileName;
-  		shouldDeploy_ = shouldDeploy;
-  	}
-	/**
-	 * @return the URL for the associated original WSDL file referenced by the client
-	 */
-	public String getWSDLUrl()
-	{
-		return wsdlUrl_;
-	}
-	
-	/**
-	 * @return the QName for the associated web service for the client
-	 */
-	public String getServiceQName()
-	{
-		return serviceQName_;
-	}
-	
-	/**
-	 * @return the name of the target project for the web service client
-	 */
-	public String getProjectName()
-	{
-		return projectName_;
-	}
-	
-	/**
-	 * @return the fileName location for the copied WSDL file into the client project
-	 */
-	public String getOutputWSDLFileName()
-	{
-		return outputWSDLFileName_;
-	}
-	
-	/**
-	 * @return the qualified classname of the generated Service Interface
-	 */
-	public String getServiceInterfaceName()
-	{
-		return serviceInterfaceName_;
-	}
-	
-	/**
-	 * @return the qualified classname of the generated Service Endpoint Interface
-	 */
-	public String[] getServiceEndpointInterfaceNames()
-	{
-		return serviceEndpointInterfaceNames_;
-	}
-	
-	/**
-	 * @return should generate code for deployment?
-	 */
-	public boolean shouldDeploy()
-	{
-		return shouldDeploy_;
-	}
-	
-	/**
-	 * @return whether the extension generated the descriptors or not
-	 */
-	public boolean shouldGenDescriptors()
-	{
-		return shouldGenDescriptors_;
-	}
-	
-	/**
-	 * Set the SI classname for the web service client
-	 */
-	public void setServiceInterfaceName(String name)
-	{
-		serviceInterfaceName_ = name;
-	}
-
-	/**
-	 * Set the SEI classnames for the web service client
-	 */
-	public void setServiceEndpointInterfaceNames(String[] names)
-	{
-		serviceEndpointInterfaceNames_ = names;
-	}
-
-	/**
-	 * Set whether descriptors were generated
-	 */
-	public void setDidGenDescriptors(boolean b)
-	{
-		shouldGenDescriptors_ = b;
-	}
-	
-	/**
-	 * This method will invoke any operations required to set up web services client, SI, and SEI
-	 */
-	public void genWebServiceClientArtifacts(WebServicesClientDataHelper dataModel)
-	{
-		// Do nothing. This shouldn't be on the interface!
-	}
-	
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wizard/test/WebServiceTestWizard.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wizard/test/WebServiceTestWizard.java
deleted file mode 100644
index 551c8d2..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wizard/test/WebServiceTestWizard.java
+++ /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
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.wizard.test;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-
-public class WebServiceTestWizard extends Wizard implements INewWizard
-{
-
-  public WebServiceTestWizard()
-  {
-    super();
-
-    TestWizardPage page = new TestWizardPage("Test page");
-  }
-
-
-
-  /**
-  * Initializes this "New" wizard.
-  * @param workbench The workbench that launched this wizard.
-  * @param selection The selection context of this wizard.
-  * @return This wizard.
-  */
-  public void init ( IWorkbench workbench, IStructuredSelection selection )
-  {
-    //Do nothing
-  }
-
-
-  public void addPages()
-  {
-
-    TestWizardPage page = new TestWizardPage("Test page");
-    addPage(page);
-  }
-
-  public boolean performFinish()
-  {
-    //Always allow finish
-    return true;
-  }
-  
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/util/ClasspathUtils.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/util/ClasspathUtils.java
deleted file mode 100644
index 9f5e3b5..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/util/ClasspathUtils.java
+++ /dev/null
@@ -1,352 +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.util;
-
-
-import java.io.File;
-import java.net.URL;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-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.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.j2ee.internal.earcreation.EARNatureRuntime;
-import org.eclipse.jst.j2ee.internal.earcreation.IEARNatureConstants;
-import org.eclipse.jst.j2ee.internal.project.IWebNatureConstants;
-import org.eclipse.jst.j2ee.internal.web.operations.J2EEWebNatureRuntime;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.StructureEdit;
-import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-import org.eclipse.wst.common.componentcore.resources.IVirtualResource;
-
-public class ClasspathUtils {
-
-	//	Copyright
-	public static final String copyright = "(c) Copyright IBM Corporation 2003."; //$NON-NLS-1$
-
-	private static ClasspathUtils instance_; //$NON-NLS-1$
-	private static String DIR_CLASSES = "classes"; //$NON-NLS-1$
-	private static String DIR_LIB = "lib"; //$NON-NLS-1$
-	private static String DOT_JAR = ".jar"; //$NON-NLS-1$
-
-	private ClasspathUtils() {
-	}
-
-	public static ClasspathUtils getInstance() {
-		if (instance_ == null)
-			instance_ = new ClasspathUtils();
-		return instance_;
-	}
-
-	public String getClasspathString(IProject project) {
-		StringBuffer classpath = new StringBuffer();
-		String[] classpathEntries = getClasspath(project, false);
-		String resourceLocation = null;
-		
-		// TODO: workaround for 90515 and 90560
-		try {
-		
-			IVirtualComponent component = ComponentCore.createComponent(project, J2EEUtils.getFirstWebModuleName(project));
-			if (component != null) {
-				
-				IFolder webModuleClasses = null;
-				StructureEdit mc = null;
-				try {
-					mc = StructureEdit.getStructureEditForRead(project);
-					WorkbenchComponent[] wbcs = mc.getWorkbenchModules();
-					if (wbcs.length!=0) {
-						IFolder  webModuleServerRoot = StructureEdit.getOutputContainerRoot(wbcs[0]);
-						webModuleClasses  = webModuleServerRoot.getFolder("WEB-INF").getFolder("classes");
-						resourceLocation = webModuleClasses.getLocation().toOSString();
-						classpath.append(resourceLocation);
-						classpath.append(";"); //$NON-NLS-1$
-					}
-				}
-				finally{
-					if (mc!=null)
-						mc.dispose();			
-				}
-				
-				IVirtualFolder webInfLib = component.getFolder(new Path(
-						"/WEB-INF/lib"));
-				if (webInfLib != null) {
-					IVirtualResource[] resources = webInfLib.members();
-					IResource aResource = null;
-					
-					for (int i = 0; i < resources.length; i++) {
-						aResource = resources[i].getUnderlyingResource();
-						resourceLocation = aResource.getLocation().toOSString();
-
-						System.out.println(resourceLocation);
-						classpath.append(resourceLocation);
-						classpath.append(";"); //$NON-NLS-1$
-					}
-				}
-			}
-		} catch (CoreException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		
-		// end of workaround
-		
-		Vector classpathVector = new Vector();
-		for (int i = 0; i < classpathEntries.length; i++) {
-			if (!classpathVector.contains(classpathEntries[i])) {
-				classpathVector.add(classpathEntries[i]);
-				classpath.append(classpathEntries[i]);
-				classpath.append(";"); //$NON-NLS-1$
-			}
-		}
-		return classpath.toString();
-	}
-
-	public URL[] getClasspathURL(IProject project) {
-		String[] classpathEntries = getClasspath(project, false);
-		Vector classpathVector = new Vector();
-		for (int i = 0; i < classpathEntries.length; i++) {
-			try {
-				File file = new File(classpathEntries[i]);
-				//        System.out.println("adding project CP["+i+"] = "+file);
-				URL url = file.toURL();
-				if (!classpathVector.contains(url))
-					classpathVector.add(url);
-			} catch (Throwable t) {
-			}
-		}
-		addLibClassspath(classpathVector);
-		// add the plugin lib directory jars to classpath
-		URL[] classpath = new URL[classpathVector.size()];
-		classpathVector.copyInto(classpath);
-		return classpath;
-	}
-
-	private void addLibClassspath(Vector classpathVector) {
-	}
-
-	private String[] getClasspath(IProject project, boolean isDependent) {
-		try {
-			String[] classpath;
-			EARNatureRuntime earProject = castToEARProject(project);
-			if (earProject != null)
-				return getClasspathForEARProject(earProject);
-			else if (project.hasNature(IWebNatureConstants.J2EE_NATURE_ID))
-				return getClasspathForWebProject(
-					(J2EEWebNatureRuntime) project.getNature(
-						IWebNatureConstants.J2EE_NATURE_ID),
-					isDependent);
-			else if (project.hasNature(JavaCore.NATURE_ID))
-				return getClasspathForJavaProject(
-					(IJavaProject) project.getNature(JavaCore.NATURE_ID));
-			else
-				return new String[0];
-		} catch (CoreException ce) {
-			return new String[0];
-		}
-	}
-
-	private EARNatureRuntime castToEARProject(IProject project) {
-		try {
-			String[] earNatures = IEARNatureConstants.NATURE_IDS;
-			for (int i = 0; i < earNatures.length; i++) {
-				if (project.hasNature(earNatures[i]))
-					return (EARNatureRuntime) project.getNature(earNatures[i]);
-			}
-			return null;
-		} catch (CoreException ce) {
-			return null;
-		}
-	}
-
-	private String[] getClasspathForEARProject(EARNatureRuntime earProject) {
-		IPath earPath =
-			earProject.getProject().getLocation().addTrailingSeparator();
-		return getDirectoryJarFiles(earPath);
-	}
-
-	private String[] getDirectoryJarFiles(IPath iPath) {
-		File dir = iPath.toFile();
-		Vector jarsVector = new Vector();
-		if (dir.exists() && dir.isDirectory()) {
-			String[] filenames = dir.list();
-			for (int i = 0; i < filenames.length; i++) {
-				if (filenames[i].endsWith(DOT_JAR))
-					jarsVector.add(path2String(iPath) + filenames[i]);
-			}
-		}
-		String[] jars = new String[jarsVector.size()];
-		jarsVector.copyInto(jars);
-		return jars;
-	}
-
-	private String[] getClasspathForWebProject(
-		J2EEWebNatureRuntime webProject,
-		boolean isDependent) {
-		String[] webinfClasses = getWEBINFClasses(webProject);
-		String[] webinfLib;
-		String[] javaClasspath;
-		if (isDependent) {
-			webinfLib = new String[0];
-			javaClasspath = new String[0];
-		} else {
-			webinfLib = getWEBINFLib(webProject);
-			javaClasspath =
-				getClasspathForJavaProject(webProject.getJ2EEJavaProject());
-		}
-		String[] webClasspath =
-			new String[webinfClasses.length
-				+ webinfLib.length
-				+ javaClasspath.length];
-		int index = 0;
-		for (int i = 0; i < webinfClasses.length; i++) {
-			webClasspath[index] = webinfClasses[i];
-			index++;
-		}
-		for (int i = 0; i < webinfLib.length; i++) {
-			webClasspath[index] = webinfLib[i];
-			index++;
-		}
-		for (int i = 0; i < javaClasspath.length; i++) {
-			webClasspath[index] = javaClasspath[i];
-			index++;
-		}
-		return webClasspath;
-	}
-
-	private String[] getWEBINFClasses(J2EEWebNatureRuntime webProject) {
-		IPath webinf =
-			webProject
-				.getProject()
-				.getLocation()
-				.addTrailingSeparator()
-				.append(
-				webProject.getWEBINFPath());
-		IPath classes =
-			((IPath) webinf.clone()).addTrailingSeparator().append(DIR_CLASSES);
-		return new String[] { path2String(classes)};
-	}
-
-	private String[] getWEBINFLib(J2EEWebNatureRuntime webProject) {
-		IPath webinf =
-			webProject
-				.getProject()
-				.getLocation()
-				.addTrailingSeparator()
-				.append(
-				webProject.getWEBINFPath());
-		IPath lib =
-			((IPath) webinf.clone())
-				.addTrailingSeparator()
-				.append(DIR_LIB)
-				.addTrailingSeparator();
-		return getDirectoryJarFiles(lib);
-	}
-
-	private String[] getClasspathForJavaProject(IJavaProject javaProject) {
-		String[] javaBuildPath;
-		try {
-			IClasspathEntry[] buildPath =
-				javaProject.getResolvedClasspath(true);
-			Vector v = new Vector();
-			for (int i = 0; i < buildPath.length; i++) {
-				String[] buildPathString =
-					classpathEntry2String(
-						buildPath[i],
-						javaProject.getProject());
-				for (int j = 0; j < buildPathString.length; j++) {
-					v.add(buildPathString[j]);
-				}
-			}
-			javaBuildPath = new String[v.size()];
-			v.copyInto(javaBuildPath);
-		} catch (JavaModelException jme) {
-			javaBuildPath = new String[0];
-		}
-
-		String[] earClasspath;
-		Vector utilityJarsVector = new Vector();
-		IProject project = javaProject.getProject();
-		IProject[] referencingProjects = project.getReferencingProjects();
-		for (int i = 0; i < referencingProjects.length; i++) {
-			EARNatureRuntime earProject =
-				castToEARProject(referencingProjects[i]);
-			if (earProject != null) {
-				String[] utilityJars = getClasspathForEARProject(earProject);
-				for (int j = 0; j < utilityJars.length; j++) {
-					utilityJarsVector.add(utilityJars[j]);
-				}
-			}
-		}
-		earClasspath = new String[utilityJarsVector.size()];
-		utilityJarsVector.copyInto(earClasspath);
-
-		String[] javaClasspath =
-			new String[javaBuildPath.length + earClasspath.length];
-		int index = 0;
-		for (int i = 0; i < javaBuildPath.length; i++) {
-			javaClasspath[index] = javaBuildPath[i];
-			index++;
-		}
-		for (int i = 0; i < earClasspath.length; i++) {
-			javaClasspath[index] = earClasspath[i];
-			index++;
-		}
-		return javaClasspath;
-	}
-
-	private String[] classpathEntry2String(
-		IClasspathEntry entry,
-		IProject project) {
-		switch (entry.getEntryKind()) {
-			case IClasspathEntry.CPE_LIBRARY :
-				return new String[] { path2String(entry.getPath())};
-			case IClasspathEntry.CPE_PROJECT :
-				return getClasspath(
-					ResourcesPlugin.getWorkspace().getRoot().getProject(
-						entry.getPath().lastSegment()),
-					true);
-			case IClasspathEntry.CPE_SOURCE :
-				{
-					IPath path = entry.getPath();
-					if (path.segment(0).equals(project.getName()))
-						path = path.removeFirstSegments(1);
-					return new String[] {
-						path2String(
-							project
-								.getLocation()
-								.addTrailingSeparator()
-								.append(
-								path))};
-				}
-			case IClasspathEntry.CPE_VARIABLE :
-				return classpathEntry2String(
-					JavaCore.getResolvedClasspathEntry(entry),
-					project);
-			default :
-				return new String[] { path2String(entry.getPath())};
-		}
-	}
-
-	private String path2String(IPath path) {
-		return path.toOSString();
-	}
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/util/FileUtil.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/util/FileUtil.java
deleted file mode 100644
index add9b0c..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/util/FileUtil.java
+++ /dev/null
@@ -1,121 +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.util;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-
-public class FileUtil
-{
-  public FileUtil()
-  {
-    super();
-  }
-
-  public static void copyFile(String src, String dest)
-  {
-    InputStream is = null;
-    FileOutputStream fos = null;
-    try
-    {
-      is = new FileInputStream(src);
-      byte buff[] = new byte[1024];
-      fos = new FileOutputStream(dest);
-      int c = 0;
-      byte[] array = new byte[1024];
-      while ((c = is.read(array)) >= 0)
-      {
-        fos.write(array, 0, c);
-      }
-    }
-    catch (Exception e)
-    {
-    }
-    finally
-    {
-      try
-      {
-        fos.close();
-        is.close();
-      }
-      catch (Exception e)
-      {
-      }
-    }
-  }
-
-  public static File createFileAndParentDirectories(String fileName) throws Exception
-  {
-    File file = new File(fileName);
-    File parent = file.getParentFile();
-    if (!parent.exists())
-    {
-      parent.mkdirs();
-    }
-    file.createNewFile();
-    return file;
-  }
-
-  public static void deleteDirectories(File dir) throws Exception
-  {
-    File[] children = dir.listFiles();
-    for (int i = 0; i < children.length; i++)
-    {
-      if (children[i].list() != null && children[i].list().length > 0)
-      {
-        deleteDirectories(children[i]);
-      }
-      else
-      {
-        children[i].delete();
-      }
-    }
-    dir.delete();
-  }
-
-  /**
-   * Creates a folder and all parent folders if not existing Project must exist
-   */
-  public static void createFolder(IFolder folder, boolean force, boolean local) throws CoreException
-  {
-    if (!folder.exists())
-    {
-      IContainer parent = folder.getParent();
-      if (parent instanceof IFolder)
-      {
-        createFolder((IFolder)parent, force, local);
-      }
-      folder.create(force, local, new NullProgressMonitor());
-    }
-  }
-
-  public static void createTargetFile(String sourceFileName, String targetFileName) throws Exception
-  {
-    createTargetFile(sourceFileName, targetFileName, false);
-  }
-
-  public static void createTargetFile(String sourceFileName, String targetFileName, boolean overwrite) throws Exception
-  {
-    File idealResultFile = new File(targetFileName);
-    if (overwrite || !idealResultFile.exists())
-    {
-      FileUtil.createFileAndParentDirectories(targetFileName);
-      FileUtil.copyFile(sourceFileName, targetFileName);
-    }
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/util/PlatformUtils.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/util/PlatformUtils.java
deleted file mode 100644
index 9911e21..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/util/PlatformUtils.java
+++ /dev/null
@@ -1,177 +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.util;
-
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.common.util.URI;
-
-public class PlatformUtils {
-
-	public static final String PLATFORM_ROOT = "platform:/resource";
-	public static final String WIN_FILE_PROTOCOL = "file:/";
-	public static final String LNX_FILE_PROTOCOL = "file://";
-	public static final String PLATFORM = "platform";
-	public static final String RESOURCE = "/resource";
-
-	private PlatformUtils() {
-	}
-
-	/**
-	* Returns the string representation of platform URL given an IPath
-	* @param IPath path
-	* @return String platformURL
-	*/
-	public static String getPlatformURL(IPath path) {
-		String platformURL;
-		platformURL = URI.createPlatformResourceURI(path.toString()).toString();
-		// old method: file system representation
-		// 	platformURL = ResourcesPlugin.getWorkspace().getRoot().getFile(path).getLocation().toString();
-		return platformURL;
-	}
-
-	/**
-	* Returns the URL representation of the Platform URL given an IPath
-	* The PlatformResourceManager underdstands this format and therefore
-	* this is suited for command URL's
-	* @param IPath path
-	* @return URL Platform URL
-	*/
-	public static URL getCommandPlatformURL(IPath path) {
-		URL url = null;
-		try {
-			url = new URL(PLATFORM, null, RESOURCE + path.toString());
-		} catch (MalformedURLException e) {
-			return url;
-		}
-		return url;
-	}
-
-	/**
-	* Returns the string representation of path given platform URL string
-	* @param String platform URL string
-	* @return String path string
-	*/
-	public static String getPathFromPlatform(String platformStr) {
-		String pathStr = platformStr;
-
-		String rootLocation;
-		rootLocation = PLATFORM_ROOT;
-		// old method: file system representation
-		//	rootLocation = ResourcesPlugin.getWorkspace().getRoot().getLocation().toString();
-		if (platformStr.startsWith(rootLocation))
-			pathStr = platformStr.substring(rootLocation.length());
-		return pathStr;
-	}
-
-	/**
-	* Returns the string representation of platform URL given the path string
-	* @param String path string
-	* @return String platform URL string
-	*/
-	public static String getPlatformFromPath(String pathStr) {
-		String platformStr = pathStr;
-
-		String rootLocation;
-		rootLocation = PLATFORM_ROOT;
-		// old method: file system representation
-		//	rootLocation = ResourcesPlugin.getWorkspace().getRoot().getLocation().toString();
-		platformStr = rootLocation + pathStr;
-		return platformStr;
-	}
-
-	/**
-	* Returns the string representation of the local file system file given platform URL string
-	* @param String platform URL string
-	* @return String file string
-	*/
-	public static String getFileFromPlatform(String platformStr) {
-		String fileStr = platformStr;
-		String pathStr = getPathFromPlatform(platformStr);
-
-		fileStr =
-			ResourcesPlugin
-				.getWorkspace()
-				.getRoot()
-				.getFile(new Path(pathStr))
-				.getLocation()
-				.toString();
-
-		// old method: file system representation
-		//	Do nothing
-
-		return fileStr;
-	}
-
-	/**
-	* Returns the file protocol representation of the local file system file given platform URL string
-	* @param String platform URL string
-	* @return String the file protocol uri
-	*/
-	public static String getFileURLFromPlatform(String platformStr) {
-		String fileStr = platformStr;
-		String pathStr = getPathFromPlatform(platformStr);
-		try {
-			fileStr =
-				ResourcesPlugin
-					.getWorkspace()
-					.getRoot()
-					.getFile(new Path(pathStr))
-					.getLocation()
-					.toFile()
-					.toURL()
-					.toString();
-		} catch (MalformedURLException murle) {
-			fileStr = getFileURLFromPath(new Path(pathStr));
-		}
-		return fileStr;
-	}
-
-	/**
-	* Returns the file protocol representation of a local file
-	* @param IPath the Path object representing the file
-	* @return String the file protocol uri
-	*/
-	public static String getFileURLFromPath(IPath path) {
-
-		String file = null;
-		if (path != null) {
-			if (!path.isAbsolute()) {
-				file =
-					ResourcesPlugin
-						.getWorkspace()
-						.getRoot()
-						.getFile(path)
-						.getLocation()
-						.toString();
-				if (file.charAt(0) == IPath.SEPARATOR) {
-					file = LNX_FILE_PROTOCOL + file;
-				} else {
-					file = WIN_FILE_PROTOCOL + file;
-				}
-			} else {
-				file = path.toString();
-			}
-			if (file != null && file.charAt(0) == IPath.SEPARATOR) {
-				file = LNX_FILE_PROTOCOL + file;
-			} else {
-				file = WIN_FILE_PROTOCOL + file;
-			}
-		}
-		return file == null ? null : file;
-
-	}
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/util/WSDLUtils.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/util/WSDLUtils.java
deleted file mode 100644
index f775199..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/util/WSDLUtils.java
+++ /dev/null
@@ -1,538 +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.util;
-
-import java.text.Collator;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.Locale;
-import java.util.Map;
-import java.util.StringTokenizer;
-
-import javax.wsdl.Binding;
-import javax.wsdl.Definition;
-import javax.wsdl.Port;
-import javax.wsdl.PortType;
-import javax.wsdl.Service;
-import javax.wsdl.extensions.soap.SOAPAddress;
-import javax.wsdl.factory.WSDLFactory;
-import javax.wsdl.xml.WSDLReader;
-import javax.xml.namespace.QName;
-
-import org.apache.axis.wsdl.toJava.Utils;
-import org.eclipse.wst.wsdl.internal.impl.wsdl4j.WSDLFactoryImpl;
-
-public class WSDLUtils {
-
-  private static final String DOT = ".";
-  private static final String SLASH = "/";
-  private static final String PROTOCOL_SUFFIX = "://";
-
-  /**
-   * Tokens in a namespace that are treated as package name part separators.
-   * Used by normalizePackageName.
-   */
-  private static final char[] pkgSeparators = { ':', '\\', '/' };
-
-  /**
-  * These are java keywords as specified at the following URL (sorted alphabetically).
-  * http://java.sun.com/docs/books/jls/second_edition/html/lexical.doc.html#229308
-  * Note that false, true, and null are not strictly keywords; they are literal values,
-  * but for the purposes of this array, they can be treated as literals.
-  */
-  static final String keywords[] =
-  {
-      "abstract",  "boolean",      "break",      "byte",      "case",
-      "catch",     "char",         "class",      "const",     "continue",
-      "default",   "do",           "double",     "else",      "extends",
-      "false",     "final",        "finally",    "float",     "for",
-      "goto",      "if",           "implements", "import",    "instanceof",
-      "int",       "interface",    "long",       "native",    "new",
-      "null",      "package",      "private",    "protected", "public",
-      "return",    "short",        "static",     "strictfp",  "super",
-      "switch",    "synchronized", "this",       "throw",     "throws",
-      "transient", "true",         "try",        "void",      "volatile",
-      "while"
-  };
-
-  /** Collator for comparing the strings */
-  static final Collator englishCollator = Collator.getInstance(Locale.ENGLISH);
-
-  /** Use this character as suffix */
-  static final char keywordPrefix = '_';
-
-  private WSDLUtils() {
-  }
-
-  /**
-  * Returns the name of the first service element in the WSDL definition.
-  * @return String service element name
-  */
-  public static String getServiceElementName(Definition definition) {
-  	Service service = (Service) definition.getServices().values().iterator().next();
-  	return service.getQName().getLocalPart();
-  }
-
-  /**
-  * Returns the name of the port type element points to by the first service and port element in the WSDL definition.
-  * @return String port type element name
-  */
-  public static String getPortTypeName(Definition definition) {
-  	Service service = (Service) definition.getServices().values().iterator().next();
-    Iterator iterator = service.getPorts().values().iterator(); 
-    while(iterator.hasNext()){
-      Port port = (Port) iterator.next();
-      for (int i=0; i<port.getExtensibilityElements().size();i++) {
-        if (port.getExtensibilityElements().get(i) instanceof SOAPAddress) {
-           Binding binding = port.getBinding();
-           return binding.getPortType().getQName().getLocalPart();
-        }
-      }
-    }
-    return "";
-  
-  }
-
-  /**
-  * Returns the name of the port element in the WSDL definition.
-  * @return String port name
-  */
-  public static String getPortName(Definition definition) {
-  	Service service = (Service) definition.getServices().values().iterator().next();
-    Iterator iterator = service.getPorts().values().iterator(); 
-    while(iterator.hasNext()){
-      Port port = (Port) iterator.next();
-      for (int i=0; i<port.getExtensibilityElements().size();i++) {
-        if (port.getExtensibilityElements().get(i) instanceof SOAPAddress) 
-          return port.getName();
-      }  
-    }
-     return "";
-  }
-
-
-
-  public static String makeNamespace (String clsName) {
-	  return makeNamespace(clsName, "http");
-  }
-
-  /**
-   * Make namespace from a fully qualified class name
-   * and the given protocol
-   *
-   * @param clsName fully qualified class name
-   * @param protocol protocol String
-   * @return namespace namespace String
-   */
-  public static String makeNamespace (String clsName, String protocol) {
-	  if (clsName.lastIndexOf('.') == -1)
-		  return protocol + "://" + "DefaultNamespace";
-	  String packageName = clsName.substring(0, clsName.lastIndexOf('.'));
-	  return makeNamespaceFromPackageName(packageName, protocol);       
-  }
-
-    
-  private static String makeNamespaceFromPackageName(String packageName, String protocol) {
-	  if (packageName == null || packageName.equals(""))
-		  return protocol + "://" + "DefaultNamespace";
-	  StringTokenizer st = new StringTokenizer( packageName, "." );
-	  String[] words = new String[ st.countTokens() ];
-	  for(int i = 0; i < words.length; ++i)
-		  words[i] = st.nextToken();
-
-	  StringBuffer sb = new StringBuffer(80);
-	  for(int i = words.length-1; i >= 0; --i) {
-		  String word = words[i];
-		  // seperate with dot
-		  if( i != words.length-1 )
-			  sb.append('.');
-		  sb.append( word );
-	  }
-	  return protocol + "://" + sb.toString();
-  }
-
-  /**
-  * Return a Definition for the wsdl url given 
-  *
-  */
-  public static Definition getWSDLDefinition(String wsdlURL)
-  {
-    if(wsdlURL == null) return null;
-
-    WSDLFactory wsdlFactory;
-    Definition definition = null;
-    String wsdlLocation = null;
-    try {
-      wsdlFactory = new WSDLFactoryImpl();
-      WSDLReader wsdlReader = wsdlFactory.newWSDLReader();
-      definition = wsdlReader.readWSDL(wsdlURL);
-    } 
-    catch (Exception e) { // can be WSDLException or IOException
-      return null;
-    }
-    return definition;
-  }
-
-  public static String getPackageName(Definition definition)
-  {
-     if (definition != null)
-     {
-        String namespace = definition.getTargetNamespace();
-        return namespaceURI2PackageName(namespace);
-     }
-     return "";
-  }
-
-  public static String getPackageNameForBindingImpl(Port port, Map ns2pkgMap)
-  {
-    if (port != null && ns2pkgMap != null)
-    {
-      Binding binding = port.getBinding();
-      QName bndQName = binding.getQName();
-      String namespace = bndQName.getNamespaceURI();
-      Object pkg = ns2pkgMap.get(namespace);
-      if (pkg != null)
-        return (String)pkg;
-    }
-    return getPackageNameForBindingImpl(port);
-  }
-
-  public static String getPackageNameForBindingImpl(Definition definition, Map ns2pkgMap)
-  {
-    if (definition != null && ns2pkgMap != null)
-    {
-      Service service = (Service) definition.getServices().values().iterator().next();
-      Port port = (Port) service.getPorts().values().iterator().next();
-      return getPackageNameForBindingImpl(port, ns2pkgMap);
-    }
-    return getPackageNameForBindingImpl(definition);
-  }
-
-  public static String getPackageNameForBindingImpl(Definition definition)
-  {
-    Port port = null;
-    if (definition != null)
-    {
-      Service service = (Service)definition.getServices().values().iterator().next();
-      port = (Port)service.getPorts().values().iterator().next();
-    }
-    return getPackageNameForBindingImpl(port);
-  }
-
-// This is yet another naming algorithm based on webservices.jar
-// They always use the binding namespace as the package name
-// of the BindingImpl class.
-public static String getPackageNameForBindingImpl(Port port)
-{
-   if (port != null)
-   {
-	  Binding binding = port.getBinding();
-//	  PortType portType = binding.getPortType();
-	  QName bndQName = binding.getQName();
-	  String namespace = bndQName.getNamespaceURI();
-	  return namespaceURI2PackageName(namespace);
-   }
-   return "";
-}
-
-/**
-* Get the namespace for the Port Type
-* 
-*/
-public static String getPortTypeNamespace(Definition definition)
-{
-  String namespace = "";
-  if (definition != null)
-  {
-	Service service = (Service) definition.getServices().values().iterator().next();
-    Iterator iterator = service.getPorts().values().iterator(); 
-	while(iterator.hasNext()){
-      Port port = (Port) iterator.next();
-      for (int i=0; i<port.getExtensibilityElements().size();i++) {
-        if (port.getExtensibilityElements().get(i) instanceof SOAPAddress){ 
-	      PortType portType = port.getBinding().getPortType();
-	      QName bndQName = portType.getQName();
-	      namespace = bndQName.getNamespaceURI();
-      	}  
-	  }
-  	}
-  }  
-  return namespace;
-}
-
-// This is yet another naming algorithm based on webservices.jar
-// They always use the porttype namespace as the package name
-// of the Java class (in ejb).
-public static String getPackageNameForPortType(Definition definition)
-{
-   if (definition != null)
-   {
-	  String namespace = getPortTypeNamespace(definition);
-	  return namespaceURI2PackageName(namespace);
-    }
-    return "";
-}
-
-  /**
-  * checks if the input string is a valid java keyword.
-  * @return boolean true/false
-  */
-  public static boolean isJavaKeyword(String keyword) {
-    return (Arrays.binarySearch(keywords, keyword, englishCollator) >= 0);
-  }
-
-  /**
-  * Turn a java keyword string into a non-Java keyword string.  (Right now
-  * this simply means appending an underscore.)
-  */
-  public static String makeNonJavaKeyword(String keyword){
-    return  keywordPrefix + keyword;
-  }
-
-  public static String getFullyQualifiedPortTypeName(Definition definition)
-  {
-    StringBuffer beanName = new StringBuffer();
-    beanName.append(getPackageNameForPortType(definition)); 
-    beanName.append(DOT);
-    beanName.append(getPortTypeName(definition));
-    return beanName.toString();
-
-  }
-
-  /**
-   * getName
-   * @param uri String
-   * @return get the file name after the last \ and /
-   */
-  public static String getName(String uri) {
-
-	// Get everything after last slash or backslash
-	int bslash = uri.lastIndexOf("\\");
-	int slash = uri.lastIndexOf("/");
-	int i =  bslash > slash ? bslash : slash;
-	String fileName = uri.substring(i+1).replace('?', '.');
-
-	return fileName;
-  }
-
-
-/**
- * getWSDLName
- * @param uri String
- * @return get the file name after the last \ and /, trimmed, defaulted to
- *         "default.wsdl" if there is no name, and ending with ".wsdl".
- */
- public static String getWSDLName(String uri) {
-
-	// Get everything after last slash or backslash from input URI
-	// with no whitespace.
-	String WSDLName = getName(uri).trim();
-
-	// if empty, return the default "default.wsdl"
-	if ( WSDLName.equals( "" ) ) {
-		WSDLName = "default.wsdl";
-	}
-
-	// make sure name ends with ".wsdl", lower case.
-	else {
-		if ( ! WSDLName.endsWith( ".wsdl" ) ) {
-			if ( WSDLName.toLowerCase().endsWith( ".wsdl" ) ) {
-				int lastDot = WSDLName.lastIndexOf(".");
-				WSDLName = WSDLName.substring( 0, lastDot ) + ".wsdl";
-			}
-			else {
-				WSDLName = WSDLName + ".wsdl";
-			}
-		}
-	}
-
-	return WSDLName;
- }
-
- /**
-  * getPortTypeNameFromBeanName
-  * @param beanname String
-  * @return get the port type name based on the bean name
-  */
-  public static String getPortTypeNameFromBeanName(String beanName) {
-    return beanName.substring(beanName.lastIndexOf('.') + 1);	
-  }
-
-  public static String getPackageName(Service service, Map ns2pkgMap)
-  {
-    if (service != null)
-    {
-      String namespace = service.getQName().getNamespaceURI();
-      if (ns2pkgMap != null)
-      {
-        Object pkg = ns2pkgMap.get(namespace);
-        if (pkg != null)
-          return (String)pkg;
-      }
-      return namespaceURI2PackageName(namespace);
-    }
-    else
-      return "";
-  }
-
-  public static String getPackageName(Port port, Map ns2pkgMap)
-  {
-    if (port != null)
-      return getPackageName(port.getBinding(), ns2pkgMap);
-    else
-      return "";
-  }
-
-  public static String getPackageName(Binding binding, Map ns2pkgMap)
-  {
-    if (binding != null)
-    {
-      String namespace = binding.getQName().getNamespaceURI();
-      if (ns2pkgMap != null)
-      {
-        Object pkg = ns2pkgMap.get(namespace);
-        if (pkg != null)
-          return (String)pkg;
-      }
-      return namespaceURI2PackageName(namespace);
-    }
-    else
-      return "";
-  }
-
-  public static String getPackageName(PortType portType, Map ns2pkgMap)
-  {
-    if (portType != null)
-    {
-      String namespace = portType.getQName().getNamespaceURI();
-      if (ns2pkgMap != null)
-      {
-        Object pkg = ns2pkgMap.get(namespace);
-        if (pkg != null)
-          return (String)pkg;
-      }
-      return namespaceURI2PackageName(namespace);
-    }
-    else
-      return "";
-  }
-
-
-  /**
-   * namespaceURI2PackageName
-   * @param namespaceURI
-   * @return package name based on namespace
-   */
-  public static String namespaceURI2PackageName(String namespaceURI)
-  {
-  	/**
-  	 * TODO:  The makePackageName method from 
-  	 * org.apache.axis.wsdl.toJava.Utils in axis-1_1 is called to map namespace to package name.  
-  	 * This will be replaced with an extension point to plug in runtime emitter specific namespace to 
-  	 * package mapping algorithm 
-  	 */
-  	return Utils.makePackageName(namespaceURI);
-  	
-//    StringBuffer sb = new StringBuffer(80);
-//    if (namespaceURI != null && namespaceURI.length() > 0)
-//    {
-//      String hostname = null;
-//      try
-//      {
-//        hostname = new URL(namespaceURI).getHost();
-//      }
-//      catch (MalformedURLException e)
-//      {
-//        int index = namespaceURI.indexOf(":");
-//        if (index > -1)
-//        {
-//          hostname = namespaceURI.substring(index+1);
-//          index = hostname.indexOf("/");
-//          if (index > -1)
-//            hostname = hostname.substring(0, index);
-//        }
-//        else
-//          hostname = namespaceURI;
-//      }
-//      
-//	  // if we didn't file a hostname, bail
-//	  if (hostname == null) {
-//		  return null;
-//	  }
-//
-//      //convert illegal java identifier
-//      hostname = hostname.replace('-', '_');
-//      // tokenize the hostname and reverse it
-//      StringTokenizer st = new StringTokenizer(hostname, ".");
-//      String[] words = new String[st.countTokens()];
-//      for (int i = 0; i < words.length; ++i)
-//        words[i] = st.nextToken();
-//      for(int i = words.length-1; i >= 0; --i)
-//      {
-//        String word = words[i];
-//        if (isJavaKeyword(word))
-//          word = makeNonJavaKeyword(word);
-//        // seperate with dot
-//        if (i != words.length-1)
-//          sb.append('.');
-//        // convert digits to underscores
-//        if (Character.isDigit(word.charAt(0)))
-//          sb.append('_');
-//          sb.append(word);
-//      }
-//    }
-//    return normalizePackageName(sb.toString(), DOT.charAt(0));
-  }
-
-  /**
-   * normalizePackageName
-   * @param pkg
-   * @param separator
-   * @return normalize a String (package name) and repalcing 
-   *         ':', '\\', '/' by separator (DOT).
-   */
-  private static String normalizePackageName(String pkg, char separator)
-  {
-	if (pkg == null) {
-		return pkg;
-	}
-	for(int i=0; i<pkgSeparators.length; i++)
-	   pkg = pkg.replace(pkgSeparators[i], separator);
-	return pkg;
-  }
-  
-  public static String resolveDotInPortName(String name) {
-	if(name.indexOf(".")<0)
-	{
-		return name;
-	}
-    StringBuffer sb = new StringBuffer();
-    boolean afterDot = false;
-    for(int i=0; i<name.length(); i++)
-    {
-    	if(name.charAt(i)=='.')
-    	{
-    		afterDot = true;
-    	}
-    	else if(afterDot)
-    	{
-    		sb.append(name.substring(i,i+1).toUpperCase());
-    		afterDot=false;
-    	}
-    	else
-    	{
-    		sb.append(name.charAt(i));
-    	}
-    }
-    return sb.toString();
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/wsrt/AxisClientConfigWidgetFactory.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/wsrt/AxisClientConfigWidgetFactory.java
deleted file mode 100644
index ee501c6..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/wsrt/AxisClientConfigWidgetFactory.java
+++ /dev/null
@@ -1,51 +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.jst.ws.internal.axis.consumption.wsrt;
-
-import org.eclipse.jst.ws.internal.axis.consumption.ui.widgets.AxisProxyWidget;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.wizard.client.WebServiceClientAxisType;
-import org.eclipse.wst.command.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.provisional.ui.widgets.INamedWidgetContributor;
-import org.eclipse.wst.command.internal.provisional.ui.widgets.INamedWidgetContributorFactory;
-import org.eclipse.wst.command.internal.provisional.ui.widgets.WidgetBindingToWidgetFactoryAdapter;
-
-public class AxisClientConfigWidgetFactory implements INamedWidgetContributorFactory {
-
-	private INamedWidgetContributor             proxyConfigWidget_;
-	private INamedWidgetContributor             mappingsWidget_;
-	private AxisProxyWidget                     proxyWidget_;
-	private WidgetBindingToWidgetFactoryAdapter adapter_;
-	
-	public AxisClientConfigWidgetFactory()
-	{
-	  adapter_ = new WidgetBindingToWidgetFactoryAdapter( new WebServiceClientAxisType() );
-	  
-	  proxyConfigWidget_ = adapter_.getWidget( "AxisClientStart" );
-	  proxyWidget_       = (AxisProxyWidget)proxyConfigWidget_.getWidgetContributorFactory().create();
-	  mappingsWidget_   = adapter_.getWidget( "AxisClientBeanMapping" );
-	}
-	
-	public INamedWidgetContributor getFirstNamedWidget() 
-	{
-	  return proxyConfigWidget_;
-	}
-
-	public INamedWidgetContributor getNextNamedWidget( INamedWidgetContributor widgetContributor) 
-	{
-	  return widgetContributor == proxyConfigWidget_ && proxyWidget_.getCustomizeClientMappings() ? mappingsWidget_ : null;
-	}
-	
-	public void registerDataMappings(DataMappingRegistry dataRegistry) 
-	{
-	  adapter_.registerDataMappings( dataRegistry );
-	}
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/wsrt/AxisWebServiceClient.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/wsrt/AxisWebServiceClient.java
deleted file mode 100644
index d4eb403..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/wsrt/AxisWebServiceClient.java
+++ /dev/null
@@ -1,156 +0,0 @@
-package org.eclipse.jst.ws.internal.axis.consumption.wsrt;
-
-import java.util.Vector;
-
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.WSDL2JavaCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.command.AxisClientDefaultingCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.command.AxisClientInputCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.command.AxisClientOutputCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.command.DefaultsForClientJavaWSDLCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.AddJarsToProjectBuildPathTask;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.CopyAxisJarCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.DefaultsForHTTPBasicAuthCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.RefreshProjectCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.Stub2BeanCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.ValidateWSDLCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.widgets.AxisClientCommandsFragment;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.widgets.AxisClientFragment.MappingFragment;
-import org.eclipse.jst.ws.internal.common.StringToIProjectTransformer;
-import org.eclipse.jst.ws.internal.consumption.command.common.BuildProjectCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ClientExtensionOutputCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.provisional.ICommandFactory;
-import org.eclipse.wst.command.internal.provisional.SimpleCommandFactory;
-import org.eclipse.wst.ws.internal.provisional.wsrt.AbstractWebServiceClient;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IContext;
-import org.eclipse.wst.ws.internal.provisional.wsrt.ISelection;
-import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceClientInfo;
-
-public class AxisWebServiceClient extends AbstractWebServiceClient
-{		
-
-	public AxisWebServiceClient(WebServiceClientInfo info)
-	{
-		super(info);
-		// TODO Auto-generated constructor stub
-	}
-
-	public ICommandFactory assemble(Environment env, IContext ctx,
-			ISelection sel, String module, String ear)
-	{
-		return null;
-	}
-
-	public ICommandFactory deploy(Environment env, IContext ctx, ISelection sel,
-			String module, String ear)
-	{
-		return null;
-	}
-
-	public ICommandFactory develop(Environment env, IContext ctx, ISelection sel,
-			String module, String ear)
-	{
-		registerDataMappings( env.getCommandManager().getMappingRegistry());
-		
-		Vector commands = new Vector();
-		commands.add(new AxisClientInputCommand(this, ctx, module));
-		commands.add(new AxisClientDefaultingCommand());
-//		commands.add(new SimpleFragment("AxisClientStart"));
-//		commands.add(new SimpleFragment("AxisClientBeanMapping"));
-		commands.add(new DefaultsForHTTPBasicAuthCommand());
-		commands.add(new CopyAxisJarCommand());
-		commands.add(new AddJarsToProjectBuildPathTask());
-		commands.add(new DefaultsForClientJavaWSDLCommand());
-		commands.add(new ValidateWSDLCommand());
-		commands.add(new WSDL2JavaCommand());
-		commands.add(new RefreshProjectCommand());
-		commands.add(new Stub2BeanCommand());
-		commands.add(new BuildProjectCommand());
-		return new SimpleCommandFactory(commands);
-	}
-
-	public ICommandFactory install(Environment env, IContext ctx, ISelection sel,
-			String module, String ear)
-	{
-		return null;
-	}
-
-	public ICommandFactory run(Environment env, IContext ctx, ISelection sel,
-			String module, String ear)
-	{
-		return null;
-	}
-		
-	public void registerDataMappings(DataMappingRegistry registry) 
-	{
-		// AxisClientDefaultingCommand
-		registry.addMapping(AxisClientInputCommand.class, "ClientProject", AxisClientDefaultingCommand.class, "ClientProject",
-				new StringToIProjectTransformer());
-//		registry.addMapping(ClientExtensionDefaultingCommand.class, "ClientRuntime", AxisClientDefaultingCommand.class, "ClientRuntimeID",
-//				null);
-//		registry.addMapping(ClientExtensionDefaultingCommand.class, "WebServicesParser", AxisClientDefaultingCommand.class);
-//		registry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProjectEAR", AxisClientDefaultingCommand.class,
-//				"ClientProjectEAR", new StringToIProjectTransformer());
-		registry.addMapping(AxisClientInputCommand.class, "WsdlURL", AxisClientDefaultingCommand.class); // URI
-																																	// to
-		// URL
-		// transformer
-		// req'd??
-//		registry.addMapping(ClientExtensionDefaultingCommand.class, "TestProxySelected", AxisClientDefaultingCommand.class,
-//				"TestProxySelected", null);
-		registry.addMapping(AxisClientInputCommand.class, "ClientServer", AxisClientDefaultingCommand.class);
-//		registry.addMapping(ClientExtensionDefaultingCommand.class, "IsClientScenario", AxisClientDefaultingCommand.class);
-		registry.addMapping(AxisClientInputCommand.class, "GenerateProxy", AxisClientDefaultingCommand.class);
-		// DefaultsForHTTPBasicAuthCommand()
-		registry.addMapping(AxisClientDefaultingCommand.class, "JavaWSDLParam", DefaultsForHTTPBasicAuthCommand.class); //OK
-		registry.addMapping(AxisClientDefaultingCommand.class, "WsdlURL", DefaultsForHTTPBasicAuthCommand.class, "WsdlServiceURL", null); //OK
-		registry.addMapping(AxisClientDefaultingCommand.class, "WebServicesParser", DefaultsForHTTPBasicAuthCommand.class); //OK
-	    registry.addMapping(AxisClientDefaultingCommand.class, "CustomizeClientMappings", MappingFragment.class );    
-		//registry.addMapping(AxisClientDefaultingCommand.class,
-		// "ServiceProject",
-		// CreateWebProjectCommand.class);
-		//registry.addMapping(AxisClientDefaultingCommand.class,
-		// "EJBProjectName",
-		// CreateWebProjectCommand.class);
-		// CopyAxisJarCommand()
-		registry.addMapping(AxisClientDefaultingCommand.class, "ClientProject", CopyAxisJarCommand.class, "Project", null);
-		// AddJarsToProjectBuildPathTask()
-		registry.addMapping(AxisClientDefaultingCommand.class, "ClientProject", AddJarsToProjectBuildPathTask.class, "Project", null);
-		// DefaultsForClientJavaWSDLCommand() // javaParam_, model_
-		registry.addMapping(AxisClientDefaultingCommand.class, "JavaWSDLParam", DefaultsForClientJavaWSDLCommand.class);
-		registry.addMapping(AxisClientDefaultingCommand.class, "ClientProject", DefaultsForClientJavaWSDLCommand.class, "ProxyProject",
-				null);
-		//		registry.addMapping(AxisClientDefaultingCommand.class, "WsdlURL",
-		// DefaultsForClientJavaWSDLCommand.class,"WSDLServicePathname",null);
-		// //
-		// URL to URL??
-		registry.addMapping(AxisClientDefaultingCommand.class, "WsdlURL", DefaultsForClientJavaWSDLCommand.class, "WSDLServiceURL", null); // URI
-		// to
-		// URL??
-		// ValidateWSDLCommand()
-		registry.addMapping(AxisClientDefaultingCommand.class, "JavaWSDLParam", ValidateWSDLCommand.class);
-		registry.addMapping(AxisClientDefaultingCommand.class, "WsdlServiceURL", ValidateWSDLCommand.class);
-		registry.addMapping(AxisClientDefaultingCommand.class, "WebServicesParser", ValidateWSDLCommand.class);
-		// WSDL2JavaCommand() // javaParam_
-		registry.addMapping(AxisClientDefaultingCommand.class, "JavaWSDLParam", WSDL2JavaCommand.class);
-		registry.addMapping(AxisClientDefaultingCommand.class, "WsdlURL", WSDL2JavaCommand.class, "WsdlURI", null); // URL
-																													// to
-																													// URI??
-		// RefreshProjectCommand()
-		registry.addMapping(AxisClientDefaultingCommand.class, "ClientProject", RefreshProjectCommand.class, "Project", null);
-		// Stub2BeanCommand()
-		registry.addMapping(AxisClientDefaultingCommand.class, "JavaWSDLParam", Stub2BeanCommand.class);
-		registry.addMapping(AxisClientDefaultingCommand.class, "WebServicesParser", Stub2BeanCommand.class);
-		registry.addMapping(AxisClientDefaultingCommand.class, "ClientProject", Stub2BeanCommand.class);
-		// BuildProjectCommand()
-		registry.addMapping(AxisClientDefaultingCommand.class, "ClientProject", BuildProjectCommand.class, "Project", null);
-		registry.addMapping(AxisClientDefaultingCommand.class, "ForceBuild", BuildProjectCommand.class);
-		registry.addMapping(AxisClientDefaultingCommand.class, "ValidationManager", BuildProjectCommand.class);
-		
-		registry.addMapping(Stub2BeanCommand.class, "ProxyBean", AxisClientOutputCommand.class, "ProxyBean", null);
-		registry.addMapping(AxisClientDefaultingCommand.class, "GenerateProxy", AxisClientCommandsFragment.class);
-//		registry.addMapping(AxisClientDefaultingCommand.class, "GenerateProxy", ClientExtensionOutputCommand.class);
-//		registry.addMapping(AxisClientDefaultingCommand.class, "SetEndpointMethod", ClientExtensionOutputCommand.class);
-	}
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/.classpath b/bundles/org.eclipse.jst.ws.axis.creation.ui/.classpath
deleted file mode 100644
index 275b34c..0000000
--- a/bundles/org.eclipse.jst.ws.axis.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.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/.cvsignore b/bundles/org.eclipse.jst.ws.axis.creation.ui/.cvsignore
deleted file mode 100644
index 8bb59e1..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-build.xml
-temp.folder
-wss-axis-ui.jar
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/.project b/bundles/org.eclipse.jst.ws.axis.creation.ui/.project
deleted file mode 100644
index 0a3d1e9..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/.project
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.ws.axis.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.axis.consumption.core</project>
-		<project>org.eclipse.jst.ws.axis.consumption.ui</project>
-		<project>org.eclipse.jst.ws.consumption</project>
-		<project>org.eclipse.jst.ws.consumption.ui</project>
-		<project>org.eclipse.jst.ws.creation.ui</project>
-		<project>org.eclipse.jst.ws.discovery.core</project>
-		<project>org.eclipse.jst.ws.ui</project>
-		<project>org.eclipse.wst.wsdl</project>
-		<project>org.eclipse.wst.ws.parser</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.creation.ui/build.properties b/bundles/org.eclipse.jst.ws.axis.creation.ui/build.properties
deleted file mode 100644
index 30ffa8d..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/build.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-source.wss-axis-ui.jar = src/
-bin.includes = wss-axis-ui.jar,\
-               deploy.xsl,\
-               plugin.properties,\
-               plugin.xml,\
-src.includes = build.properties,\
-               deploy.xsl,\
-               plugin.xml,\
-               plugin.properties,\
-               src/
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/deploy.xsl b/bundles/org.eclipse.jst.ws.axis.creation.ui/deploy.xsl
deleted file mode 100644
index 3fdf164..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/deploy.xsl
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    version="1.0"
-    xmlns:xalan="http://xml.apache.org/xslt"
-    xmlns:ns1="http://xml.apache.org/axis/wsdd/"
-    xmlns:java="http://xml.apache.org/axis/wsdd/providers/java">
-    <xsl:output method="xml" encoding="UTF-8"/>
-  
-   <xsl:param name="newClassName" select="ss"/>
-   
-    <xsl:template match="/ns1:deployment/ns1:service/ns1:parameter[@name='className']">
-    <xsl:copy>
-       <xsl:attribute name="name">className</xsl:attribute>
-       	 <xsl:attribute name="value"> 	
-  			<xsl:value-of select="$newClassName"/>  	 	
-       	 </xsl:attribute>
-       	<xsl:apply-templates/>
-       	</xsl:copy>
-    </xsl:template>
-    
-    <xsl:template match="@*|node()">
-    	<xsl:copy>
-    		<xsl:apply-templates select="@*|node()"/>
-    	</xsl:copy>
-    </xsl:template>
-</xsl:stylesheet>
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/plugin.properties b/bundles/org.eclipse.jst.ws.axis.creation.ui/plugin.properties
deleted file mode 100644
index 4d4dd70..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/plugin.properties
+++ /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
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-PLUGIN_NAME=Webservice Axis Creation UI
-PLUGIN_PROVIDER=Eclipse.org
-
-LABEL_RUNTIME_AXIS_11=Apache Axis 1.1
-DESC_RUNTIME_AXIS_11=Apache Axis 1.1
-
-#
-#WSWSDLAxisType
-#
-WS_NAME_WSDLAXIS=Skeleton Java bean Axis Web service
-
-#
-#WSBeanAxisType
-#
-WS_NAME_BEANAXIS=Java bean Axis Web service
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/plugin.xml b/bundles/org.eclipse.jst.ws.axis.creation.ui/plugin.xml
deleted file mode 100644
index 2ea9f63..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/plugin.xml
+++ /dev/null
@@ -1,196 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin
-   id="org.eclipse.jst.ws.axis.creation.ui"
-   version="1.0.0"
-   name="%PLUGIN_NAME"
-   provider-name="%PLUGIN_PROVIDER"
-   class="org.eclipse.jst.ws.internal.axis.creation.ui.plugin.WebServiceAxisCreationUIPlugin">
-
-   <runtime>
-      <library name="wss-axis-ui.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-
-   <requires>
-      <import plugin="org.eclipse.jdt.launching"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.jdt.core"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.emf.common"/>
-      <import plugin="org.eclipse.emf.ecore"/>
-      <import plugin="org.eclipse.jem"/>
-      <import plugin="org.eclipse.jem.workbench"/>
-      <import plugin="org.eclipse.wst.ws.parser"/>
-      <import plugin="org.eclipse.jst.ws"/>
-      <import plugin="org.eclipse.jst.ws.creation.ui"/>
-      <import plugin="org.eclipse.jst.ws.consumption.ui"/>
-      <import plugin="org.eclipse.jst.ws.consumption"/>
-      <import plugin="org.eclipse.jst.ws.ui"/>
-      <import plugin="org.eclipse.jst.ws.axis.consumption.core"/>
-      <import plugin="org.eclipse.jst.ws.axis.consumption.ui"/>
-      <import plugin="org.eclipse.core.runtime.compatibility"/>
-      <import plugin="org.eclipse.jem.workbench"/>
-      <import plugin="org.eclipse.wst.command.env.core"/>
-      <import plugin="org.eclipse.wst.command.env"/>
-      <import plugin="org.eclipse.wst.command.env.ui"/>
-      <import plugin="org.eclipse.wst.server.core"/>
-      <import plugin="org.eclipse.wst.ws"/>
-      <import plugin="org.eclipse.wst.wsdl"/>
-      <import plugin="org.eclipse.jst.j2ee"/>
-      <import plugin="org.eclipse.jst.j2ee.core"/>
-      <import plugin="org.eclipse.jst.j2ee.ejb"/>
-      <import plugin="org.eclipse.jst.j2ee.web"/>
-      <import plugin="org.eclipse.wst.common.emf"/>
-      <import plugin="org.eclipse.wst.common.emfworkbench.integration"/>
-      <import plugin="org.eclipse.wst.common.frameworks"/>
-      <import plugin="org.wsdl4j"/>
-   </requires>
-
-   <!-- Web Service Server Types -->
-
-   <extension
-         point="org.eclipse.jst.ws.consumption.ui.webServiceServerRuntimeType">
-
-      <webServiceRuntime
-            label="%LABEL_RUNTIME_AXIS_11"
-            description="%DESC_RUNTIME_AXIS_11"
-            isDefault="false"
-            j2eeversion="13 14"
-            id="org.eclipse.jst.ws.runtime.axis11">
-      </webServiceRuntime>
-
-      <webServiceServer
-            factoryId="org.eclipse.jst.server.tomcat.32"
-            isDefault="false"
-            runtimeTypeIds="org.eclipse.jst.server.tomcat.32.runtime"
-            id="SERVER_ID_TOMCAT32_LOCAL">
-      </webServiceServer>
-
-      <webServiceServer
-            factoryId="org.eclipse.jst.server.tomcat.40"
-            isDefault="false"
-            runtimeTypeIds="org.eclipse.jst.server.tomcat.40.runtime"
-            id="SERVER_ID_TOMCAT40_LOCAL">
-      </webServiceServer>
-
-      <webServiceServer
-            factoryId="org.eclipse.jst.server.tomcat.41"
-            isDefault="false"
-            runtimeTypeIds="org.eclipse.jst.server.tomcat.41.runtime"
-            id="SERVER_ID_TOMCAT41_LOCAL">
-      </webServiceServer> 
-
-      <webServiceServer
-            factoryId="org.eclipse.jst.server.tomcat.50"
-            isDefault="false"
-            runtimeTypeIds="org.eclipse.jst.server.tomcat.50.runtime"
-            id="SERVER_ID_TOMCAT50_LOCAL">  
-      </webServiceServer>    
-
-      <webServiceServerRuntimeType
-            requireEJBModule="false"
-            requireWebModule="true"
-            name="%WS_NAME_BEANAXIS"
-            type="org.eclipse.jst.ws.type.java"
-            runtime="org.eclipse.jst.ws.runtime.axis11"
-            assemblyBinding="org.eclipse.jst.ws.internal.axis.creation.ui.wizard.beans.WSBeanAxisType"
-            server="SERVER_ID_TOMCAT50_LOCAL"
-            id="org.eclipse.jst.ws.internal.axis.creation.ui.wizard.beans.WSBeanAxisType.TOMCAT50LOCAL">
-      </webServiceServerRuntimeType>
-
-      <webServiceServerRuntimeType
-            requireEJBModule="false"
-            requireWebModule="true"
-            name="%WS_NAME_WSDLAXIS"
-            type="org.eclipse.jst.ws.type.wsdl"
-            runtime="org.eclipse.jst.ws.runtime.axis11"
-            assemblyBinding="org.eclipse.jst.ws.internal.axis.creation.ui.wizard.wsdl.WSWSDLAxisType"
-            server="SERVER_ID_TOMCAT50_LOCAL"
-            id="org.eclipse.jst.ws.internal.axis.creation.ui.wizard.wsdl.WSWSDLAxisType.TOMCAT50LOCAL">
-      </webServiceServerRuntimeType>
-
-      <webServiceServerRuntimeType
-            requireEJBModule="false"
-            requireWebModule="true"
-            name="%WS_NAME_BEANAXIS"
-            type="org.eclipse.jst.ws.type.java"
-            runtime="org.eclipse.jst.ws.runtime.axis11"
-            assemblyBinding="org.eclipse.jst.ws.internal.axis.creation.ui.wizard.beans.WSBeanAxisType"
-            server="SERVER_ID_TOMCAT41_LOCAL"
-            id="org.eclipse.jst.ws.internal.axis.creation.ui.wizard.beans.WSBeanAxisType.TOMCAT41LOCAL">
-      </webServiceServerRuntimeType>
-
-      <webServiceServerRuntimeType
-            requireEJBModule="false"
-            requireWebModule="true"
-            name="%WS_NAME_WSDLAXIS"
-            type="org.eclipse.jst.ws.type.wsdl"
-            runtime="org.eclipse.jst.ws.runtime.axis11"
-            assemblyBinding="org.eclipse.jst.ws.internal.axis.creation.ui.wizard.wsdl.WSWSDLAxisType"
-            server="SERVER_ID_TOMCAT41_LOCAL"
-            id="org.eclipse.jst.ws.internal.axis.creation.ui.wizard.wsdl.WSWSDLAxisType.TOMCAT41LOCAL">
-      </webServiceServerRuntimeType>
-
-      <webServiceServerRuntimeType
-            requireEJBModule="false"
-            requireWebModule="true"
-            name="%WS_NAME_BEANAXIS"
-            type="org.eclipse.jst.ws.type.java"
-            runtime="org.eclipse.jst.ws.runtime.axis11"
-            assemblyBinding="org.eclipse.jst.ws.internal.axis.creation.ui.wizard.beans.WSBeanAxisType"
-            server="SERVER_ID_TOMCAT40_LOCAL"
-            id="org.eclipse.jst.ws.internal.axis.creation.ui.wizard.beans.WSBeanAxisType.TOMCAT40LOCAL">
-      </webServiceServerRuntimeType>
-
-      <webServiceServerRuntimeType
-            requireEJBModule="false"
-            requireWebModule="true"
-            name="%WS_NAME_WSDLAXIS"
-            type="org.eclipse.jst.ws.type.wsdl"
-            runtime="org.eclipse.jst.ws.runtime.axis11"
-            assemblyBinding="org.eclipse.jst.ws.internal.axis.creation.ui.wizard.wsdl.WSWSDLAxisType"
-            server="SERVER_ID_TOMCAT40_LOCAL"
-            id="org.eclipse.jst.ws.internal.axis.creation.ui.wizard.wsdl.WSWSDLAxisType.TOMCAT40LOCAL">
-      </webServiceServerRuntimeType>
-
-   </extension>
-
-   <!-- Server Defaulters -->
-   
-   <extension point="org.eclipse.jst.ws.consumption.serverDefaulter">
-      <serverDefaulter
-         class="org.eclipse.jst.ws.internal.axis.creation.ui.command.AxisServerDefaulter">
-      </serverDefaulter>
-   </extension>
-   
-   <extension point="org.eclipse.jst.ws.consumption.ui.webServiceRuntime">
-  	<webServiceRuntime
-    id="org.eclipse.jst.ws.axis.creation.axisWebServiceRT"
-    label="%LABEL_RUNTIME_AXIS_11"
-    serviceTypes="org.eclipse.jst.ws.serviceType.java org.eclipse.jst.ws.serviceType.wsdl"
-    clientTypes="org.eclipse.jst.ws.clientType.java.webOnly"
-    servletLevels="23 24"
-    j2eeLevels="13 14"
-    servers="org.eclipse.jst.server.tomcat.40 org.eclipse.jst.server.tomcat.41 org.eclipse.jst.server.tomcat.50"
-    class="org.eclipse.jst.ws.internal.axis.creation.wsrt.AxisWebServiceRuntime">
-  	</webServiceRuntime>
-	</extension> 
-
-	<extension point="org.eclipse.wst.command.env.ui.widgetRegistry">
-       <widgetFactory   
-             id="AxisBeanConfig"
-             insertBeforeCommandId="org.eclipse.jst.ws.internal.axis.creation.ui.task.BUCheckAxisDeploymentDescriptors"
-             class="org.eclipse.jst.ws.internal.axis.creation.wsrt.AxisBeanConfigWidgetFactory"/>
-    </extension> 
-    
-	<extension point="org.eclipse.wst.command.env.ui.widgetRegistry">
-       <widgetFactory   
-             id="AxisSkeletonConfig"
-             insertBeforeCommandId="org.eclipse.jst.ws.internal.axis.creation.ui.task.TDCheckAxisDeploymentDescriptors"
-             class="org.eclipse.jst.ws.internal.axis.creation.wsrt.AxisSkeletonConfigWidgetFactory"/>
-    </extension> 
-
-</plugin>
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/axis/creation/ui/plugin.properties b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/axis/creation/ui/plugin.properties
deleted file mode 100644
index 9331c7e..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/axis/creation/ui/plugin.properties
+++ /dev/null
@@ -1,170 +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.
-#
-
-#
-# Error messages used in this plugin
-#
-MSG_ERROR_INTERAL=IWAB0512E Internal error
-MSG_ERROR_PROJECT_URL=IWAB0514E Unable to get URL for project {0}
-MSG_ERROR_READ_WSDL=IWAB0516E Error in reading WSDL file {0}
-MSG_ERROR_WSDL_NO_PORT=IWAB0518E WSDL file at {0} has no port element
-MSG_ERROR_CANNOT_NO_JAVA_BEAN=IWAB0015E A Java bean was not selected
-MSG_ERROR_NO_PROJECT=IWAB0016E A project was not selected
-MSG_ERROR_CANNOT_LOAD_JAVA_BEAN=IWAB0017E The Java bean, {0}, cannot be loaded from {1}
-MSG_ERROR_JAVA_MOF_REFLECT_FAILED=IWAB0521E Failed to analyze the Java bean: {0}.
-MSG_ERROR_READ_BEAN=IWAB0522E Error in reading methods from Java bean.
-MSG_ERROR_MOVE_RESOURCE=IWAB0523E Error moving resource
-MSG_ERROR_UPDATE_AXIS_WSDD=IWAB0524E Error updating Axis deploy.wsdd file
-MSG_ERROR_LITERAL_SUPPORT_MESSAGE=IWAB0536E Axis 1.0 support for Document/Literal and Document/Literal (Wrapped) is minimal, thus the generated code may contain errors. RPC/Encoded is the recommended style and encoding selection.
-MSG_ERROR_INITIAL_SELECTION=IWAB0018E Error getting initial selection.
-
-
-#
-#JavaToWSDLMethodCommand
-#
-TASK_LABEL_JAVA_TO_WSDL=Create deployment descriptor document model from Java bean.
-TASK_DESC_JAVA_TO_WSDL=Creating deployment descriptor document model from Java bean.
-MSG_ERROR_JAVA_TO_METHOD=IWAB0019E Error in getting method from Java bean.
-
-#
-#DefaultsForServerJavaWSDLTask
-#
-TASK_LABEL_SERVER_JAVA_WSDL_DEFAULTS=DefaultsForJavaWSDLServer
-TASK_DESC_SERVER_JAVA_WSDL_DEFAULTS=Builds the JavaWSDLParameter for server side.
-
-#
-#UpdateWEBXMLCommand
-#
-TASK_LABEL_UPDATE_WEB_XML=UpdateWEBXMLCommand
-TASK_DESC_UPDATE_WEB_XML=Update project's web.xml file with Axis servlets
-MSG_ERROR_UPDATE_WEB_XML=IWAB0020E Error in adding servlet in web.xml.
-
-#
-#DefaultsForWSDL2SkeletonTask
-#
-
-#
-#MoveDeploymentFilesTask
-#
-TASK_LABEL_MOVE_DEPLOYMENT_FILES=MoveDeploymentFilesTask
-TASK_DESC_MOVE_DEPLOYMENT_FILES=Move deploy.wsdd and undeploy.wsdd from Java Source to Web Content/WEB-INF
-
-#
-#MoveJavaFilesTask
-#
-TASK_LABEL_MOVE_JAVA_FILES=MoveJavaFilesTask
-TASK_DESC_MOVE_JAVA_FILES=Move server side java files
-
-#
-#Skeleton2WSDLTask
-#
-TASK_LABEL_SKELETON_WSDL=DefaultsForSkeleton2WSDLTask
-TASK_DESC_SKELETON_WSDL=Creates WSDL for a Java bean skeleton.
-
-#
-#UpdateAxisWSDDFileTask
-#
-TASK_LABEL_UPDATE_AXIS_WSDD=UpdateAxisWSDDFileTask
-TASK_DESC_UPDATE_AXIS_WSDD=Update Axis deploy.wsdd with actual service implementation class name
-MSG_PLUGIN_FILE_URL=Problem locating plugin file
-
-#
-#WebServiceWSDLAxisSelectionPage
-#
-PAGE_MSG_NO_FILE_SPECIFIED=No file specified.
-PAGE_MSG_NO_METHOD_SELECTED=No methods selected.
-
-#
-#WebServiceSkeletonAxisConfigFragment
-#
-
-#
-#WebServiceSkeletonAxisConfigPage
-#
-TOOLTIP_PBSC_PAGE=
-TOOLTIP_PBCF_TEXT_URI=The SOAP body namespace and unique identifier of the Web service.
-TOOLTIP_PBCF_TEXT_WSDL_FOLDER=The folder of the WSDL file.
-TOOLTIP_PBCF_TEXT_WSDL_FILE=The name of the WSDL file.
-LABEL_URI=Web service URI:
-LABEL_OUTPUT_FOLDER_NAME=WSDL Folder:
-LABEL_OUTPUT_FILE_NAME=WSDL File:
-
-
-#
-#WSWSDLAxisType
-#
-WS_NAME_WSDLAXIS=Skeleton Java bean Axis Web service
-WS_DESC_WSDLAXIS=Skeleton Java bean Axis Web service
-
-#
-#WSBeanAxisType
-#
-
-#
-#WebServiceAxisBeanClassFragment
-#
-
-#
-#WebServiceAxisBeanClassPage
-#
-PAGE_TITLE_WSBEAN_CLASS=Web Service Java Bean Selection
-PAGE_DESC_WSBEAN_CLASS=Select a Java bean
-LABEL_EXPLORE_MAPPINGS_BEAN2XML=Define custom mapping for package to namespace.
-TOOLTIP_P2N_SHOW_MAPPINGS=Define package to namespace mapping for customization.
-
-#
-#WebServiceAxisBeanConfigFragment
-#
-
-#
-#WebServiceAxisBeanConfigPage
-#
-TOOLTIP_PBCF_PAGE=
-TOOLTIP_PBCF_TEXT_URI=The SOAP body namespace and unique identifier of the Web service.
-TOOLTIP_PBME_TREE_METHODS=Java bean methods to include.
-PAGE_TITLE_WSBEAN_CONFIG=Web Service Java Bean Identity
-PAGE_DESC_WSBEAN_CONFIG=Configure the Java bean as a Web service.
-LABEL_STYLE_USE=Style and Use
-STYLE_RPC_LITERAL=Document/ Literal
-STYLE_DOC_LITERAL=Document/ Literal (Wrapped)
-STYLE_RPC_ENCODED=RPC/ Encoded
-
-#
-#WSDLConsumptionTaskFactory
-#
-
-#
-#CopyAxisServerConfigTask
-#
-
-TASK_LABEL_COPY_SERVER_CONFIG_FILES=Copy server-config.wsdd from the server location to the Web Project
-TASK_DESC_COPY_SERVER_CONFIG_FILES=Coping server-config.wsdd from the server location to the Web Project
-
-
-#
-#LiteralSupportMessageTask
-#
-TASK_LABEL_LITERAL_SUPPORT_MESSAGE=Axis support for Literal encoding message task
-TASK_DESC_LITERAL_SUPPORT_MESSAGE=Axis support for Literal encoding message task
-
-#
-#BUAxisInputCommand and BUAxisOutputCommand
-#
-
-TASK_LABEL_BU_AXIS_INPUT=Bottom up Axis input commmand
-TASK_DESC_BU_AXIS_INPUT=Bottom up Axis input commmand
-TASK_LABEL_BU_AXIS_OUTPUT=Bottom up Axis output commmand
-TASK_DESC_BU_AXIS_OUTPUT=Bottom up Axis output commmand
-
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisOutputCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisOutputCommand.java
deleted file mode 100644
index b62a963..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisOutputCommand.java
+++ /dev/null
@@ -1,80 +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.axis.creation.ui.command;
-
-
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.creation.wsrt.AxisWebService;
-import org.eclipse.jst.ws.internal.axis.creation.wsrt.AxisWebServiceInfo;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-
-
-public class AxisOutputCommand extends SimpleCommand {
-
-	private static String LABEL = "TASK_LABEL_BU_AXIS_OUTPUT";
-	private static String DESCRIPTION = "TASK_DESC_BU_AXIS_OUTPUT";
-	
-	private AxisWebService ws_;
-	private JavaWSDLParameter javaWSDLParam_;
-
-	private String            wsdlURI_;
-	  
-	  private boolean isWebProjectStartupRequested_ = false;
-	  
-	  private MessageUtils msgUtils_;
-	  
-		/**
-		* Default CTOR
-		*/
-		public AxisOutputCommand() {
-			String       pluginId = "org.eclipse.jst.ws.axis.creation.ui";
-		    msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
-		    setName (msgUtils_.getMessage(LABEL));
-			setDescription( msgUtils_.getMessage(DESCRIPTION));
-		}
-		
-		public AxisOutputCommand(AxisWebService ws) {
-			String       pluginId = "org.eclipse.jst.ws.axis.creation.ui";
-		    msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
-		    setName (msgUtils_.getMessage(LABEL));
-			setDescription( msgUtils_.getMessage(DESCRIPTION));
-			ws_ = ws;
-		}
-		
-		public Status execute(Environment env){
-		  	
-		  	Status status = new SimpleStatus("");  	
-		  	ws_.getWebServiceInfo().setWsdlURL(wsdlURI_);
-			AxisWebServiceInfo axisWSInfo = new AxisWebServiceInfo();
-			axisWSInfo.setJavaWSDLParameter(javaWSDLParam_);
-			ws_.setAxisWebServiceInfo(axisWSInfo);		    
-		  	
-		  	return status;      	
-		  }
-
-		  /**
-		   * @param wsdlURI
-		   *            The wsdlURI to set.
-		   */
-		  public void setWsdlURI(String wsdlURI)
-		  {
-		    wsdlURI_ = wsdlURI;
-		  }
-
-		public void setJavaWSDLParam (JavaWSDLParameter javaWSDLParam_) {
-			this.javaWSDLParam_ = javaWSDLParam_;
-		}
-		  
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisRunInputCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisRunInputCommand.java
deleted file mode 100644
index 2378296..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisRunInputCommand.java
+++ /dev/null
@@ -1,75 +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.axis.creation.ui.command;
-
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.creation.wsrt.AxisWebService;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebService;
-
-public class AxisRunInputCommand extends SimpleCommand{
-	
-	private static String LABEL = "TASK_LABEL_BU_AXIS_INPUT";
-	private static String DESCRIPTION = "TASK_DESC_BU_AXIS_INPUT";
-	
-	private AxisWebService ws_;
-	private JavaWSDLParameter javaWSDLParam_;
-	private String serverProject_; 
-	  
-	private MessageUtils msgUtils_;
-	
-	public AxisRunInputCommand() {
-		String       pluginId = "org.eclipse.jst.ws.axis.creation.ui";
-	    msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
-	    setName (msgUtils_.getMessage(LABEL));
-		setDescription( msgUtils_.getMessage(DESCRIPTION));
-	}
-	
-	public AxisRunInputCommand(AxisWebService ws, String module) {
-		String       pluginId = "org.eclipse.jst.ws.axis.creation.ui";
-	    msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
-	    setName (msgUtils_.getMessage(LABEL));
-		setDescription( msgUtils_.getMessage(DESCRIPTION));
-		ws_ = ws;
-		serverProject_ = module; 
-	}
-	
-	 public Status execute(Environment env)
-	  {
-	    
-	  	String       pluginId = "org.eclipse.jst.ws.axis.creation.ui";
-	    msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
-	    
-		javaWSDLParam_ = ws_.getAxisWebServiceInfo().getJavaWSDLParameter();
-		
-		return new SimpleStatus("");
-	  }
-	
-	 /**
-	   * @return Returns the serverProject.
-	   */
-	  public String getServerProject()
-	  {
-		  return serverProject_;
-	  }
-	  
-	public JavaWSDLParameter getJavaWSDLParam() {
-		return javaWSDLParam_;
-	}
-	
-	
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisServerDefaulter.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisServerDefaulter.java
deleted file mode 100644
index b378b6b..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisServerDefaulter.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.jst.ws.internal.axis.creation.ui.command;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.ws.internal.consumption.common.IServerDefaulter;
-import org.eclipse.jst.ws.internal.consumption.common.ServerInfo;
-
-
-
-public class AxisServerDefaulter implements IServerDefaulter
-{
-  /* (non-Javadoc)
-   * @see org.eclipse.jst.ws.internal.consumption.common.IServerDefaulter#recommendDefaultServer(org.eclipse.core.resources.IProject)
-   */
-  public ServerInfo recommendDefaultServer(IProject project)
-  {    
-    return null;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/BUAxisInputCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/BUAxisInputCommand.java
deleted file mode 100644
index 62775b6..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/BUAxisInputCommand.java
+++ /dev/null
@@ -1,93 +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.axis.creation.ui.command;
-
-
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebService;
-
-
-public class BUAxisInputCommand extends SimpleCommand {
-
-	private static String LABEL = "TASK_LABEL_BU_AXIS_INPUT";
-	private static String DESCRIPTION = "TASK_DESC_BU_AXIS_INPUT";
-	
-	private IWebService ws_;
-	private String serverProject_; 
-
-	  private String serviceServerTypeID_;
-	  
-	  private MessageUtils msgUtils_;
-	  
-		/**
-		* Default CTOR
-		*/
-		public BUAxisInputCommand() {
-			String       pluginId = "org.eclipse.jst.ws.axis.creation.ui";
-		    msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
-		    setName (msgUtils_.getMessage(LABEL));
-			setDescription( msgUtils_.getMessage(DESCRIPTION));
-		}
-		
-		public BUAxisInputCommand(IWebService ws, String module) {
-			String       pluginId = "org.eclipse.jst.ws.axis.creation.ui";
-		    msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
-		    setName (msgUtils_.getMessage(LABEL));
-			setDescription( msgUtils_.getMessage(DESCRIPTION));
-			ws_ = ws;
-			serverProject_ = module; 
-		}
-		
-	  public Status execute(Environment env)
-	  {
-	    
-	  	String       pluginId = "org.eclipse.jst.ws.axis.creation.ui";
-	    msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
-	    
-		String serverInstanceId = ws_.getWebServiceInfo().getServerInstanceId();
-		String serverFactoryId = ws_.getWebServiceInfo().getServerFactoryId();
-		
-		IServer serviceExistingServer=null;
-		
-		if (serverInstanceId != null) { // server exists
-	    	serviceExistingServer = ServerCore.findServer(serverInstanceId);
-			if (serviceExistingServer != null)
-		    {
-		      serviceServerTypeID_ = serviceExistingServer.getServerType().getId();
-		    }
-	    }
-	    else
-	    {
-	    	serviceServerTypeID_ = serverFactoryId;
-	    }
-		
-		return new SimpleStatus("");
-	  }
-	  
-		/**
-		   * @return Returns the serverProject.
-		   */
-		  public String getServerProject()
-		  {
-			  return serverProject_;
-		  }
-
-		  public String getServiceServerTypeID()
-		  {
-		    return serviceServerTypeID_;
-		  }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/ComputeAxisSkeletonBeanCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/ComputeAxisSkeletonBeanCommand.java
deleted file mode 100644
index 33db21b..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/ComputeAxisSkeletonBeanCommand.java
+++ /dev/null
@@ -1,72 +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.axis.creation.ui.command;
-
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.ws.parser.wsil.WebServicesParser;
-
-
-public class ComputeAxisSkeletonBeanCommand extends SimpleCommand
-{
-  private List classNames;
-  //private String wsdlURI;
-  //private WebServicesParser webServicesParser;
-  private JavaWSDLParameter javaWSDLParameter;
-
-  public ComputeAxisSkeletonBeanCommand()
-  {
-  }
-
-  public Status execute(Environment environment)
-  {
-    classNames = new Vector();
-    if (javaWSDLParameter != null)
-    {
-      String beanName = javaWSDLParameter.getBeanName();
-      if (beanName != null)
-        classNames.add(beanName);
-    }
-    return new SimpleStatus("");
-  }
-
-  public List getClassNames()
-  {
-    return classNames;
-  }
-
-  /**
-   * @param webServicesParser The webServicesParser to set.
-   */
-  public void setWebServicesParser(WebServicesParser webServicesParser)
-  {
-    //this.webServicesParser = webServicesParser;
-  }
-
-  /**
-   * @param wsdlURI The wsdlURI to set.
-   */
-  public void setWsdlURI(String wsdlURI)
-  {
-    //this.wsdlURI = wsdlURI;
-  }
-  
-  public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParameter)
-  {
-    this.javaWSDLParameter = javaWSDLParameter;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/JavaToWSDLMethodCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/JavaToWSDLMethodCommand.java
deleted file mode 100644
index ca953c1..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/JavaToWSDLMethodCommand.java
+++ /dev/null
@@ -1,229 +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.creation.ui.command;
-
-
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jem.internal.plugin.JavaEMFNature;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jem.java.impl.JavaClassImpl;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.Log;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-
-
-public class JavaToWSDLMethodCommand extends SimpleCommand {
-
-	private static String LABEL = "TASK_LABEL_JAVA_TO_WSDL";
-	private static String DESCRIPTION = "TASK_DESC_JAVA_TO_WSDL";
-	private static String JAVA_EXTENSION = ".java"; //$NON-NLS-1$
-	private static String CLASS_EXTENSION = ".class"; //$NON-NLS-1$
-
-	private Hashtable fMethodNames;
-	private String fClassName;
-	private String fBeanName;
-	private String fbeanBaseName;
-	private IProject fProject;
-	private JavaWSDLParameter javaWSDLParam_;
-	private IProject serviceProject_;
-	private MessageUtils msgUtils_;
-
-	/**
-	* Default CTOR
-	*/
-	public JavaToWSDLMethodCommand() {
-		String       pluginId = "org.eclipse.jst.ws.axis.creation.ui";
-	    msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
-	    setName (msgUtils_.getMessage(LABEL));
-		setDescription( msgUtils_.getMessage(DESCRIPTION));
-	}
-	/**
-	* Default CTOR
-	*/
-	public JavaToWSDLMethodCommand(
-		JavaWSDLParameter javaParameter,
-		IProject serviceProject) {
-		String       pluginId = "org.eclipse.jst.ws.axis.creation.ui";
-	    msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
-	    setName (msgUtils_.getMessage(LABEL));
-		setDescription( msgUtils_.getMessage(DESCRIPTION));
-		javaWSDLParam_ = javaParameter;
-		serviceProject_ = serviceProject;
-
-	}
-
-	/**
-	* JavaToToWSDLMethod execute
-	*/
-	public Status execute(Environment environment) {
-		fbeanBaseName = javaWSDLParam_.getBeanName();
-		environment.getLog().log(Log.INFO, 5070, this, "execute", "beanBaseName = "+fbeanBaseName);
-		Status status;
-		try {
-			//Get the qualified bean name; my.package.MyClass
-			fMethodNames = new Hashtable();
-			Hashtable oldMethodsNames = javaWSDLParam_.getMethods();
-			String qName = fbeanBaseName;
-
-			if (qName.toLowerCase().endsWith(JAVA_EXTENSION)
-				|| qName.toLowerCase().endsWith(CLASS_EXTENSION)) {
-				qName = qName.substring(0, qName.lastIndexOf('.'));
-			}
-
-			JavaEMFNature jMOF =
-				(JavaEMFNature) JavaEMFNature.createRuntime(
-					serviceProject_);
-			JavaClass javaClass =
-				(JavaClass) JavaClassImpl.reflect(qName, jMOF.getResourceSet());
-			if (!javaClass.isExistingType()) {
-				environment.getLog().log(Log.ERROR, 5022, this, "execute", msgUtils_.getMessage(
-						"MSG_ERROR_JAVA_MOF_REFLECT_FAILED",
-						new String[] { qName }));
-				
-				status = new SimpleStatus("JavaToWSDLMethodCommand", //$NON-NLS-1$
-						msgUtils_.getMessage(
-					"MSG_ERROR_JAVA_MOF_REFLECT_FAILED",
-					new String[] { qName }),
-					Status.ERROR);
-				environment.getStatusHandler().reportError(status);
-				return status;
-			}
-
-			// Get the qualified name
-			fClassName = javaClass.getQualifiedName();
-			fBeanName = fClassName;
-			String beanName;
-			if (fClassName.lastIndexOf('.') != -1) {
-				beanName =
-					fClassName.substring(
-						fClassName.lastIndexOf('.') + 1,
-						fClassName.length());
-			} else
-				beanName = fClassName;
-
-			// Walk the java class and get the method names
-			gatherMethods(javaClass, beanName, oldMethodsNames);
-			/*
-			Iterator m = javaClass.getPublicMethodsExtended().iterator();
-			while (m.hasNext()) {
-				Method method = (Method) m.next();  
-				if ( ! method.isConstructor()){ 
-				if (!beanName.equals(method.getName())
-					&& !(isDuplicateMethodName(method
-						.getMethodElementSignature()))
-					&& !(method
-						.getContainingJavaClass()
-						.getJavaName()
-						.equalsIgnoreCase("javax.ejb.EJBObject"))	//$NON-NLS-1$
-					&& !(method
-						.getContainingJavaClass()
-						.getJavaName()
-						.equalsIgnoreCase("javax.ejb.EJBObject[]"))	//$NON-NLS-1$
-					&& !(method
-						.getContainingJavaClass()
-						.getJavaName()
-						.equalsIgnoreCase("java.lang.Object"))	//$NON-NLS-1$
-					&& !(method
-						.getContainingJavaClass()
-						.getJavaName()
-						.equalsIgnoreCase("java.lang.Object[]"))) {	//$NON-NLS-1$
-					// add the method name to our list of method names
-					String methodName =method.getMethodElementSignature();
-		          Boolean isSelected = new Boolean(true);
-        		  if (oldMethodsNames != null && oldMethodsNames.containsKey(methodName))
-          			isSelected = (Boolean)oldMethodsNames.get(methodName);
-		          fMethodNames.put(methodName, isSelected);
-				} 
-				}
-			}
-			*/
-			javaWSDLParam_.setMethods(fMethodNames);
-			
-			return new SimpleStatus( "" );
-
-		} catch (Exception e) {
-			environment.getLog().log(Log.ERROR, 5023, this, "execute", msgUtils_.getMessage("MSG_ERROR_READ_BEAN"));
-		
-			status = new SimpleStatus("JavaToWSDLMethodCommand", //$NON-NLS-1$
-					msgUtils_.getMessage(
-				"MSG_ERROR_JAVA_TO_METHOD"),
-				Status.ERROR, e);
-			environment.getStatusHandler().reportError(status);
-			return status;
-		}
-	}
-
-  private void gatherMethods(JavaClass javaClass, String beanName, Hashtable oldMethodsNames)
-  {
-    String javaName = javaClass.getJavaName();
-    if (!javaClass.isInterface()
-        && !javaName.equalsIgnoreCase("javax.ejb.EJBObject[]")
-        && !javaName.equalsIgnoreCase("javax.ejb.EJBObject")
-        && !javaName.equalsIgnoreCase("java.lang.Object[]")
-        && !javaName.equalsIgnoreCase("java.lang.Object"))
-    {
-      List publicMethods = javaClass.getPublicMethods();
-      for (Iterator it = publicMethods.iterator(); it.hasNext();)
-      {
-        Method method = (Method)it.next();
-        if (!method.isConstructor()
-            && !beanName.equals(method.getName())
-            && !(isDuplicateMethodName(method.getMethodElementSignature())))
-        {
-          // add the method name to our list of method names
-          String methodName = method.getMethodElementSignature();
-          Boolean isSelected = new Boolean(true);
-          if (oldMethodsNames != null && oldMethodsNames.containsKey(methodName))
-            isSelected = (Boolean)oldMethodsNames.get(methodName);
-          fMethodNames.put(methodName, isSelected);
-        }
-      }
-      gatherMethods(javaClass.getSupertype(), beanName, oldMethodsNames);
-    }
-  }
-	  
-	//Returns true if the provided method name already exists in the 
-	//fMethodNames vector. This method is used to detect overloaded 
-	//methods in Beans and EJBs, which are currently unsupported.
-	private boolean isDuplicateMethodName(String methodName) {
-		return (fMethodNames == null ? false: fMethodNames.containsKey(methodName));
-	}
-	
-	/**
-	 * Returns the javaWSDLParam.
-	 * @return JavaWSDLParameter
-	 */
-	public JavaWSDLParameter getJavaWSDLParam() {
-		return javaWSDLParam_;
-	}
-
-	/**
-	 * Sets the javaWSDLParam.
-	 * @param javaWSDLParam The javaWSDLParam to set
-	 */
-	public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam) {
-		this.javaWSDLParam_ = javaWSDLParam;
-	}
-	
-	public void setServiceProject(IProject serviceProject)
-	{
-	  serviceProject_ = serviceProject;
-	}
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/TDAxisInputCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/TDAxisInputCommand.java
deleted file mode 100644
index 9439ccc..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/TDAxisInputCommand.java
+++ /dev/null
@@ -1,84 +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.axis.creation.ui.command;
-
-
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebService;
-
-
-public class TDAxisInputCommand extends SimpleCommand {
-
-	private static String LABEL = "TASK_LABEL_TD_AXIS_INPUT";
-	private static String DESCRIPTION = "TASK_DESC_TD_AXIS_INPUT";
-	
-	private IWebService ws_;
-	private String serverProject_; 
-
-	  private String serverServer_;
-	  private String wsdlURI_;
-	  
-	  private MessageUtils msgUtils_;
-	  
-		/**
-		* Default CTOR
-		*/
-		public TDAxisInputCommand() {
-			String       pluginId = "org.eclipse.jst.ws.axis.creation.ui";
-		    msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
-		    setName (msgUtils_.getMessage(LABEL));
-			setDescription( msgUtils_.getMessage(DESCRIPTION));
-		}
-		
-		public TDAxisInputCommand(IWebService ws, String module) {
-			String       pluginId = "org.eclipse.jst.ws.axis.creation.ui";
-		    msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
-		    setName (msgUtils_.getMessage(LABEL));
-			setDescription( msgUtils_.getMessage(DESCRIPTION));
-			ws_ = ws;
-			serverProject_ = module; 
-		}
-		
-	  public Status execute(Environment env)
-	  {
-	    
-	  	String       pluginId = "org.eclipse.jst.ws.axis.creation.ui";
-	    msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
-	    
-		String serverServer = ws_.getWebServiceInfo().getServerInstanceId();	
-		wsdlURI_ = ws_.getWebServiceInfo().getWsdlURL();
-		
-		return new SimpleStatus("");
-	  }
-	  
-		/**
-		   * @return Returns the serverProject.
-		   */
-		  public String getServerProject()
-		  {
-			  return serverProject_;
-		  }
-
-		  public String getServerServer()
-		  {
-		    return serverServer_;
-		  }
-
-		public String getWsdlURI() {
-			return wsdlURI_;
-		}
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/UpdateWEBXMLCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/UpdateWEBXMLCommand.java
deleted file mode 100644
index c994d9d..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/UpdateWEBXMLCommand.java
+++ /dev/null
@@ -1,197 +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.creation.ui.command;
-
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit;
-import org.eclipse.jst.j2ee.webapplication.Servlet;
-import org.eclipse.jst.j2ee.webapplication.ServletMapping;
-import org.eclipse.jst.j2ee.webapplication.ServletType;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationFactory;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.common.componentcore.StructureEdit;
-import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
-
-public class UpdateWEBXMLCommand extends SimpleCommand {
-
-	private String LABEL = "TASK_LABEL_UPDATE_WEB_XML";
-	private String DESCRIPTION = "TASK_DESC_UPDATE_WEB_XML";
-
-	private MessageUtils msgUtils_;
-	private IProject serverProject;
-
-  public UpdateWEBXMLCommand()
-  {
-    String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
-    msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
-    setName (msgUtils_.getMessage(LABEL));
-    setDescription( msgUtils_.getMessage(DESCRIPTION));
-  }
-
-	public Status execute(Environment environment) {
-		if (serverProject != null) {
-			Status status = null;
-			status = addServlet(serverProject, getAxisServletDescriptor());
-			if (status.getSeverity() == Status.ERROR) {
-				environment.getStatusHandler().reportError(status);
-				return status;
-			}
-			if (status.getSeverity() == Status.ERROR) {
-				environment.getStatusHandler().reportError(status);
-				return status;
-			}
-			addServlet(serverProject, getAdmintServletDescriptor());
-			if (status.getSeverity() == Status.ERROR) {
-				environment.getStatusHandler().reportError(status);
-				return status;
-			}
-		}
-		return new SimpleStatus( "" );
-	}
-
-	private ServletDescriptor getAxisServletDescriptor() {
-
-		ServletDescriptor sd = new ServletDescriptor();
-		sd._name = "AxisServlet"; //$NON-NLS-1$
-		sd._displayName = "Apache-Axis Servlet"; //$NON-NLS-1$
-		sd._className = "org.apache.axis.transport.http.AxisServlet"; //$NON-NLS-1$
-		sd._mappings = new String[] { "/servlet/AxisServlet", //$NON-NLS-1$
-										"*.jws", //$NON-NLS-1$
-										"/services/*" }; //$NON-NLS-1$
-		return sd;
-	}
-
-	private ServletDescriptor getAdmintServletDescriptor() {
-		ServletDescriptor sd = new ServletDescriptor();
-		sd._name = "AdminServlet"; //$NON-NLS-1$
-		sd._displayName = "Axis Admin Servlet"; //$NON-NLS-1$
-		sd._className = "org.apache.axis.transport.http.AdminServlet"; //$NON-NLS-1$
-		sd._mappings = new String[] { "/servlet/AdminServlet" }; //$NON-NLS-1$
-		sd._loadOnStartup = new Integer(100);
-		return sd;
-	}
-
-	private ServletDescriptor getSoapMonitorServletDescriptor() {
-		ServletDescriptor sd = new ServletDescriptor();
-		sd._name = "SOAPMonitorService"; //$NON-NLS-1$
-		sd._displayName = "SOAPMonitorService"; //$NON-NLS-1$
-		sd._className = "org.apache.axis.monitor.SOAPMonitorService"; //$NON-NLS-1$
-		sd._mappings = new String[] { "/SOAPMonitor" }; //$NON-NLS-1$
-		sd._loadOnStartup = new Integer(100);
-		Map params = new HashMap();
-		params.put("SOAPMonitorPort", //$NON-NLS-1$
-					 "5001");   //$NON-NLS-1$
-		sd._params = params;
-		return sd;
-	}
-
-	public Status addServlet(
-		IProject webProject,
-		ServletDescriptor servletDescriptor) {
-
-		Object accessorKey = new Object();
-		WebArtifactEdit webEdit = null;		
-		StructureEdit structEdit = null;
-		try {
-			// 
-			WebApp webapp = null;
-			structEdit = StructureEdit.getStructureEditForRead(webProject);;
-			WorkbenchComponent wbcs[] = structEdit.getWorkbenchModules();
-			
-			webEdit = WebArtifactEdit.getWebArtifactEditForWrite(wbcs[0]);
-			if (webEdit != null)
-				webapp = (WebApp) webEdit.getDeploymentDescriptorRoot();
-			//
-			
-			boolean foundServlet = false;
-
-			List theServlets = webapp.getServlets();
-			for (int i = 0; i < theServlets.size(); i++) {
-				Servlet aServlet = (Servlet) theServlets.get(i);
-				if (aServlet.getServletName().equals(servletDescriptor._name)) {
-					foundServlet = true;
-				}
-			}
-
-			if (foundServlet) {
-				return new SimpleStatus( "" );
-			}
-
-			WebapplicationFactory factory = WebapplicationFactory.eINSTANCE;
-
-			Servlet servlet = factory.createServlet();
-			ServletType servletType = factory.createServletType();
-			servlet.setWebType(servletType);
-			servlet.setServletName(servletDescriptor._name);
-			servletType.setClassName(servletDescriptor._className);
-			if(servletDescriptor._displayName != null){
-			   servlet.setDisplayName(servletDescriptor._displayName);
-			}
-			if(servletDescriptor._loadOnStartup != null){
-				servlet.setLoadOnStartup(servletDescriptor._loadOnStartup);
-			}
-			if(servletDescriptor._params != null){
-				Properties properties = servlet.getParamsAsProperties();
-				properties.putAll(servletDescriptor._params);
-			}
-			webapp.getServlets().add(servlet);
-			
-			if(servletDescriptor._mappings != null){
-				for(int i=0; i<servletDescriptor._mappings.length; i++){
-					ServletMapping servletMapping = factory.createServletMapping();
-					servletMapping.setServlet(servlet);
-					servletMapping.setUrlPattern(servletDescriptor._mappings[i]);
-					webapp.getServletMappings().add(servletMapping);					
-				}
-			}
-
-			return new SimpleStatus( "" );
-		} catch (Exception e) {
-
-			return new SimpleStatus(
-					"UpdateWEBXMLCommand.addServlet", //$NON-NLS-1$
-					msgUtils_.getMessage("MSG_ERROR_UPDATE_WEB_XML"),
-					Status.ERROR, e);
-		}
-		finally{
-			if (webEdit != null)
-				webEdit.dispose();	
-			if (structEdit!=null)
-				structEdit.dispose();
-		}
-	}
-
-  public void setServerProject(IProject serverProject)
-  {
-    this.serverProject = serverProject;
-  }
-
-	public class ServletDescriptor {
-		String _name;
-		String _className;
-		String _displayName;
-		Map _params;
-		String[] _mappings;
-		Integer _loadOnStartup;
-	}
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/plugin/WebServiceAxisCreationUIPlugin.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/plugin/WebServiceAxisCreationUIPlugin.java
deleted file mode 100644
index e0e2eb1..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/plugin/WebServiceAxisCreationUIPlugin.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.jst.ws.internal.axis.creation.ui.plugin;
-
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.text.MessageFormat;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPluginDescriptor;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.wst.command.env.core.common.Log;
-import org.eclipse.wst.command.env.eclipse.EclipseLog;
-
-/**
-* 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 WebServiceAxisCreationUIPlugin extends AbstractUIPlugin
-{
-	
-	// Copyright
-	public static final String copyright = "(c) Copyright IBM Corporation 2003."; //$NON-NLS-1$
-
-  /**
-  * The identifier of the descriptor of this plugin in plugin.xml.
-  */
-  public static final String ID = "org.eclipse.jst.ws.axis.creation.ui";	//$NON-NLS-1$
-
-  /**
-  * The reference to the singleton instance of this plugin.
-  */
-  private static WebServiceAxisCreationUIPlugin instance_;
-  private Log log_;
-
-  /**
-  * Constructs a runtime plugin object for this plugin.
-  * The "plugin" element in plugin.xml should include the attribute
-  * class = "org.eclipse.jst.ws.internal.ui.plugin.WebServicePlugin".
-  * @param descriptor The descriptor of this plugin.
-  */
-  public WebServiceAxisCreationUIPlugin ( IPluginDescriptor descriptor )
-  {
-    super(descriptor);
-    if (instance_ == null)
-    {
-      instance_ = this;
-    }
-    log_ = new EclipseLog();
-
-  }
-
-  /**
-  * Returns the singleton instance of this plugin. Equivalent to calling
-  * (WebServiceWasCreationUIPlugin)Platform.getPlugin("org.eclipse.jst.ws.was.v5.tp.ui");
-  * @return The WebServiceConsumptionUIPlugin singleton.
-  */
-  static public WebServiceAxisCreationUIPlugin getInstance ()
-  {
-    return instance_;
-  }
-
-  /**
-  * Called once by the platform when this plugin is first loaded.
-  * @throws CoreException If this plugin fails to start.
-  */
-  public void startup () throws CoreException
-  {
-  	log_.log(Log.INFO, 5068, this, "startup", "Starting plugin org.eclipse.jst.ws.axis.creation.ui");
-    super.startup();
-    setPreferences();
-  }
-
-  /**
-  * Called once by the platform when this plugin is unloaded.
-  * @throws CoreException If this plugin fails to shutdown.
-  */
-  public void shutdown () throws CoreException
-  {
-  	log_.log(Log.INFO, 5069, this, "shutdown", "Shutting plugin org.eclipse.jst.ws.axis.creation.ui");
-    super.shutdown();
-  }
-
-
-  /**
-   * Sets the general preferences to the values in the preferences store.
-  **/
-  public void setPreferences()
-  {
-   // setDialogsPreferences();
-  }
-
- /**
-   * @see AbstractUIPlugin#initializeDefaultPreferences
-   */
-  protected void initializeDefaultPreferences(IPreferenceStore preferenceStore) {
-
-	// Set the defaults Preference
-//	ActionDialogsPreferenceHelper.initializeDefaults(preferenceStore);
-  }
- 
-  /**
-  * 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 )
-  {
-    return instance_.getDescriptor().getResourceString(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_.getDescriptor().getInstallURL();
-      URL imageURL = new URL(installURL,name);
-      return ImageDescriptor.createFromURL(imageURL);
-    }
-    catch (MalformedURLException e)
-    {
-      return null;
-    }
-  }
-  
-  public String getPluginStateLocation() {
-    return Platform.getPluginStateLocation(this).addTrailingSeparator().toOSString();
-  }
-
-  public String getPluginInstallLocation() {
-    try {
-      return Platform.resolve(getDescriptor().getInstallURL()).getFile();
-    }
-    catch (Exception e) {
-      return null;
-    }
-  }
-  }
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/BUCheckAxisDeploymentDescriptors.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/BUCheckAxisDeploymentDescriptors.java
deleted file mode 100644
index 247e36e..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/BUCheckAxisDeploymentDescriptors.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.eclipse.jst.ws.internal.axis.creation.ui.task;
-
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.CheckAxisDeploymentDescriptorsTask;
-
-public class BUCheckAxisDeploymentDescriptors extends CheckAxisDeploymentDescriptorsTask 
-{
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/CopyAxisServerConfigTask.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/CopyAxisServerConfigTask.java
deleted file mode 100644
index d4ad80e..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/CopyAxisServerConfigTask.java
+++ /dev/null
@@ -1,199 +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.axis.creation.ui.task;
-
-
-import java.io.File;
-import java.io.FileInputStream;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.common.EnvironmentUtils;
-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.wst.command.env.common.FileResourceUtils;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.command.env.core.context.ResourceContext;
-import org.eclipse.wst.command.env.core.context.TransientResourceContext;
-import org.eclipse.wst.server.core.IServer;
-
-public class CopyAxisServerConfigTask extends SimpleCommand {
-
-
-	private final String LABEL = "TASK_LABEL_COPY_SERVER_CONFIG_FILES";
-	private final String DESCRIPTION ="TASK_DESC_COPY_SERVER_CONFIG_FILES";
-	
-	private final String DEPLOYEDSERVICES = "WEB-INF" + File.separator + "server-config.wsdd"; //$NON-NLS-1$
-    private MessageUtils msgUtils_;
-    private MessageUtils coreMsgUtils_;
-    private MessageUtils baseConMsgUtils_;
-	private JavaWSDLParameter javaWSDLParam_;
-	private IProject serviceProject_;
-	private Boolean projectRestartRequired_;
-	private String serviceServerTypeID_;
-	private IServer serviceExistingServer_;
-	// rm private Model model_;
-
-	public CopyAxisServerConfigTask() {
-		String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
-		msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-	    coreMsgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.core.consumption", this );
-	    baseConMsgUtils_ = new MessageUtils( "org.eclipse.jst.ws.consumption.plugin", this );
-		setDescription(msgUtils_.getMessage(DESCRIPTION));
-		setName(msgUtils_.getMessage(LABEL));	 
-
-	}
-	
-	public CopyAxisServerConfigTask(JavaWSDLParameter javaWSDLParam) {
-		String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
-		msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-	    coreMsgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.core.consumption", this );
-	    baseConMsgUtils_ = new MessageUtils( "org.eclipse.jst.ws.consumption.plugin", this );
-		setDescription(msgUtils_.getMessage(DESCRIPTION));
-		setName(msgUtils_.getMessage(LABEL));	  
-		javaWSDLParam_ = javaWSDLParam;
-
-	}
-
-	/**
-	* Execute CopyAxisServerConfigTask
-	*/
-	public Status execute(Environment env) {
-	  
-	  // rm 
-	  /*
-	    //Begin setters
-	  WebServiceElement webServiceElement =
-		WebServiceElement.getWebServiceElement(model_);
-	  setServiceProject(webServiceElement.getServiceProject());
-	  setServiceServerTypeID(webServiceElement.getServiceServerTypeID());
-	  setServiceExistingServer(webServiceElement.getServiceExistingServer());
-	  
-	    //End Setters
-	     */
-	  
-	  
-	    Status status = new SimpleStatus( "" );
-	    
-		if (javaWSDLParam_ == null) {
-		    status = new SimpleStatus("", coreMsgUtils_.getMessage("MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET"), Status.ERROR);
-		    env.getStatusHandler().reportError(status);
-		    return status;
-		}
-
-		// rm 
-		/*
-		if (model_ == null) {
-		    status = new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_MODEL_NOT_SET"), Status.ERROR);
-		    return status;
-		}
-		*/
-		
-		try {
-
-		    projectRestartRequired_ = Boolean.TRUE;
-			// rm webServiceElement.setProjectRestartRequired(true);
-
-			IProject project = serviceProject_;
-			if (project == null) {
-			    status = new SimpleStatus("", baseConMsgUtils_.getMessage("MSG_ERROR_PROJECT_NOT_FOUND"), Status.ERROR);
-			    env.getStatusHandler().reportError(status);
-			    return status;
-			}
-
-			IServer instance =
-				ServerUtils.getServerForModule(
-					ResourceUtils.getModule(project),
-					serviceServerTypeID_,
-					serviceExistingServer_,
-					true,
-					EnvironmentUtils.getIProgressMonitor(env));
-			if (instance == null) {
-			    status = new SimpleStatus("", baseConMsgUtils_.getMessage("MSG_ERROR_INSTANCE_NOT_FOUND"), Status.ERROR);
-			    env.getStatusHandler().reportError(status);
-			    return status;
-			}
-
-// M5 Port:  replacing instance.isLocal() with instance.getFactoryId().indexOf("test") > 0
-			if (!(instance.getServerType().getId().indexOf(".te") > 0)) {
-				IPath installPath = instance.getRuntime().getLocation();
-				IPath sourcePath = installPath.append(
-						"webapps").append(  //$NON-NLS-1$
-						project.getName());
-
-//				IPath webModulePath = ResourceUtils.getWebModuleServerRoot(project).getFullPath();
-				IPath webModulePath = J2EEUtils.getFirstWebContentPath(project);
-				ResourceContext context = new TransientResourceContext();
-				context.setOverwriteFilesEnabled(true);
-				context.setCreateFoldersEnabled(true);
-				context.setCheckoutFilesEnabled(true);
-				IFile file =
-					FileResourceUtils.createFile(
-						context,
-						webModulePath.append(DEPLOYEDSERVICES),
-						new FileInputStream(
-							sourcePath.append(DEPLOYEDSERVICES).toOSString()),
-						env.getProgressMonitor(),
-						env.getStatusHandler());
-			}
-			return status;
-			
-		} catch (Exception e) {
-		  return status;
-		}
-
-	}
-
-
-	/**
-	* Sets the javaWSDLParam.
-	* @param javaWSDLParam The javaWSDLParam to set
-	*/
-	public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam) {
-		javaWSDLParam_ = javaWSDLParam;
-	}
-	
-	public void setServiceProject(IProject serviceProject)
-	{
-	  serviceProject_ = serviceProject;
-	}
-	
-	public void setServiceServerTypeID(String serviceServerTypeID)
-	{
-	  serviceServerTypeID_ = serviceServerTypeID;
-	}
-	
-	public void setServiceExistingServer(IServer serviceExistingServer)
-	{
-	  serviceExistingServer_ = serviceExistingServer;
-	}	
-
-	// rm 
-	/*
-	public void setModel(Model model)
-	{
-	  model_ = model;
-	}
-	*/
-	
-	public Boolean getProjectRestartRequired()
-	{
-	  return projectRestartRequired_;
-	}
-		
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/DefaultsForServerJavaWSDLCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/DefaultsForServerJavaWSDLCommand.java
deleted file mode 100644
index 6ad24f7..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/DefaultsForServerJavaWSDLCommand.java
+++ /dev/null
@@ -1,285 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies 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.creation.ui.task;
-
-
-import javax.wsdl.Definition;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-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.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.consumption.util.ClasspathUtils;
-import org.eclipse.jst.ws.internal.axis.consumption.util.FileUtil;
-import org.eclipse.jst.ws.internal.axis.consumption.util.PlatformUtils;
-import org.eclipse.jst.ws.internal.axis.consumption.util.WSDLUtils;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.wsil.Utils;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.parser.discovery.WebServicesParserExt;
-import org.eclipse.wst.ws.parser.wsil.WebServicesParser;
-
-public class DefaultsForServerJavaWSDLCommand extends SimpleCommand {
-
-	private MessageUtils msgUtils_;
-	private MessageUtils coreMsgUtils_;
-	private MessageUtils conMsgUtils_;
-	
-	// rm private Model model_;
-	private JavaWSDLParameter javaWSDLParam_ = null;
-	private IProject serviceProject_;
-	private String javaBeanName_; // this needs to be set by the extension with initial selection
-	private String WSDLServiceURL_;
-	private String WSDLServicePathname_;
-	private WebServicesParser WSParser_;
-	// rm private WebServiceElement wse_; // temporary
-	
-	private String LABEL = "TASK_LABEL_SERVER_JAVA_WSDL_DEFAULTS";
-	private String DESCRIPTION = "TASK_DESC_SERVER_JAVA_WSDL_DEFAULTS";
-	private final String WSDL_FOLDER = "wsdl"; //$NON-NLS-1$
-	public final String SERVICE_EXT = "/services/"; //$NON-NLS-1$
-	private final String WSDL_EXT = "wsdl"; //$NON-NLS-1$
-	public final byte MODE_BEAN = (byte) 0;
-	public final String SERVICE_NAME_EXT = "Service"; //$NON-NLS-1$
-
-	public DefaultsForServerJavaWSDLCommand() {
-
-		String       pluginId = "org.eclipse.jst.ws.axis.creation.ui";
-	    msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
-	    coreMsgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.core.consumption", this );
-	    conMsgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.ui.plugin", this );
-
-		setName (msgUtils_.getMessage(LABEL));
-		setDescription( msgUtils_.getMessage(DESCRIPTION));
-	}
-	
-
-	public DefaultsForServerJavaWSDLCommand(
-		JavaWSDLParameter javaWSDLParam,
-		Model model) {
-
-		String       pluginId = "org.eclipse.jst.ws.axis.creation.ui";
-	    msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
-	    coreMsgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.core.consumption", this );
-
-		setName (msgUtils_.getMessage(LABEL));
-		setDescription( msgUtils_.getMessage(DESCRIPTION));
-		//rm setModel(model);
-		setJavaWSDLParam(javaWSDLParam);
-	
-	}
-
-	/**
-	* Execute DefaultsForJavaToWSDLTask
-	*/
-	public Status execute( Environment env ) {
-
-		Status status;
-		if (javaWSDLParam_ == null) {
-			status = new SimpleStatus( "DefaultsForServerJavaWSDLTask", coreMsgUtils_.getMessage("MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET"), Status.ERROR );
-			env.getStatusHandler().reportError(status);
-			return status;
-		}
-		
-		if (javaBeanName_ == null) {  // either set by extension point or bean class page
-			javaBeanName_ = javaWSDLParam_.getBeanName();
-			if (javaBeanName_ == null) {
-				//rm javaBeanName_ = isdElement.getJavaBeanName();
-				javaWSDLParam_.setBeanName(javaBeanName_);
-			}
-		}
-		// rm WSParser_ =	(WebServicesParser) wse_.getWSParser();
-		
-		javaWSDLParam_.setServerSide(JavaWSDLParameter.SERVER_SIDE_BEAN);
-		javaWSDLParam_.setSkeletonDeploy(false);
-
-		javaWSDLParam_.setBeanName(javaBeanName_);
-		String classpath = ClasspathUtils.getInstance().getClasspathString(serviceProject_);
-		javaWSDLParam_.setClasspath(classpath);
-
-		String simpleBeanName = javaBeanName_;
-		String beanPackageName = null;
-		if (javaBeanName_ != null) {
-			int index = javaBeanName_.lastIndexOf('.');
-			if (index != -1) {
-				simpleBeanName = javaBeanName_.substring(index + 1);
-				beanPackageName = javaBeanName_.substring(0, index);
-			}
-		}
-		String namespace = WSDLUtils.makeNamespace(javaWSDLParam_.getBeanName());
-		javaWSDLParam_.setNamespace(namespace);
-
-		javaWSDLParam_.setPortTypeName(simpleBeanName);
-		javaWSDLParam_.setServiceName(simpleBeanName + SERVICE_NAME_EXT);
-
-		IPath moduleServerRoot = null;
-
-		IPath modulePath = serviceProject_.getFullPath();
-		IPath webinfPath = serviceProject_.getFullPath();
-		try {
-			if ( ResourceUtils.isWebProject(serviceProject_)) {
-				moduleServerRoot = ResourceUtils.getJavaSourceLocation(serviceProject_);
-				// should use ModuleCore.getSourceContainers();
-//				IContainer container = ResourceUtils.getWebModuleServerRoot(serviceProject_);
-//				if (container!=null) {
-//					moduleServerRoot = container.getFullPath();
-//				}
-				
-				modulePath = modulePath.append(J2EEUtils.getFirstWebModuleName(serviceProject_));
-				webinfPath = J2EEUtils.getFirstWebInfPath(serviceProject_);
-			}
-
-		} catch (Exception e) {
-			status =  new SimpleStatus( "DefaultsForServerJavaWSDLTask", conMsgUtils_.getMessage("MSG_ERROR_DEFAULT_BEAN"), Status.ERROR, e );
-			env.getStatusHandler().reportError(status);
-			return status;
-		}
-
-		IPath wsdlPath =
-			modulePath.append(WSDL_FOLDER).append(simpleBeanName).addFileExtension(WSDL_EXT);
-
-		try{
-			IFolder folder = ResourceUtils.getWorkspaceRoot().getFolder(modulePath.append(WSDL_FOLDER));
-			FileUtil.createFolder(folder, true, true);
-		
-		}
-		catch(CoreException e){
-			status = new SimpleStatus( "DefaultsForServerJavaWSDLTask", conMsgUtils_.getMessage("MSG_ERROR_WRITE_WSDL"), Status.ERROR, e );
-			env.getStatusHandler().reportError(status);
-			return status;
-		}
-		
-		String wsdlLocation = ResourceUtils.getWorkspaceRoot().getFile(wsdlPath).getLocation().toString();
-
-		javaWSDLParam_.setOutputWsdlLocation(wsdlLocation);
-		javaWSDLParam_.setInputWsdlLocation(wsdlLocation);
-		WSDLServicePathname_ = wsdlPath.toString();
-
-		if (wsdlPath != null) {
-			String wsdlURL = PlatformUtils.getFileURLFromPath(new Path(wsdlLocation));
-			WSDLServiceURL_ = wsdlURL;
-			// set parser 
-			if (wsdlURL == null || wsdlURL.length() <= 0) {
-				IResource res =
-					ResourceUtils.findResource(WSDLServicePathname_);
-				if (res != null)
-					wsdlURL = (new Utils()).toFileSystemURI(res);
-			}
-			Definition definition = null;
-			if (wsdlURL != null && wsdlURL.length() > 0) {
-				if (WSParser_ == null) {
-					WSParser_ = new WebServicesParserExt();
-				}
-				definition = WSParser_.getWSDLDefinition(wsdlURL);
-			}
-		}
-
-		javaWSDLParam_.setStyle(JavaWSDLParameter.STYLE_RPC);
-		javaWSDLParam_.setUse(JavaWSDLParameter.USE_ENCODED);
-
-		String projectURL =	ResourceUtils.getEncodedWebProjectURL(serviceProject_);
-		String serviceURL = null;
-		if (projectURL == null) {
-			status = new SimpleStatus( "DefaultsForServerJavaWSDLTask", msgUtils_.getMessage("MSG_ERROR_PROJECT_URL"), Status.ERROR);
-			env.getStatusHandler().reportError(status);
-			return status;
-		}
-		serviceURL = projectURL + SERVICE_EXT + simpleBeanName;
-
-		javaWSDLParam_.setUrlLocation(serviceURL);
-
-		javaWSDLParam_.setMetaInfOnly(true);
-
-		//		String javaOutput = PlatformUtils.getPlatformURL(moduleServerRoot);
-		//		String output = PlatformUtils.getPlatformURL(modulePath);
-
-		String javaOutput =	ResourceUtils.findResource(moduleServerRoot).getLocation().toString();
-	
-		String serviceName = javaWSDLParam_.getServiceName();
-		IPath outputPath =	ResourceUtils.findResource(webinfPath).getLocation();
-		String output = serviceProject_.getFullPath().toString();
-		if (outputPath!=null)
-		 output = outputPath.append(serviceName).toString();
-
-		javaWSDLParam_.setJavaOutput(javaOutput);
-		javaWSDLParam_.setOutput(output);
-		
-		return new SimpleStatus( "" );
-	}
-
-	/**
-	 * Returns the javaWSDLParam.
-	 * @return JavaWSDLParameter
-	 */
-	public JavaWSDLParameter getJavaWSDLParam() {
-		return javaWSDLParam_;
-	}
-
-	/**
-	 * Sets the javaWSDLParam.
-	 * @param javaWSDLParam The javaWSDLParam to set
-	 */
-	public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam) {
-		this.javaWSDLParam_ = javaWSDLParam;
-	}
-
-	// rm
-	/*
-	public void setModel(Model model) {
-		this.model_ = model;
-	}
-	*/
-	
-	public void setServiceProject(IProject serviceProject) {
-		this.serviceProject_ = serviceProject;
-	}
-	
-	public void setJavaBeanName(String javaBeanName) {
-		this.javaBeanName_ = javaBeanName;
-	}
-	
-	public String getWSDLServiceURL() {
-		return WSDLServiceURL_;
-	}
-	
-	public String getWSDLServicePathname() {
-		return WSDLServicePathname_;
-	}
-	
-	public void setParser(WebServicesParser wsParser) {
-		this.WSParser_ = wsParser;
-	}
-	
-	public WebServicesParser getParser() {
-		return WSParser_;
-	}
-
-  public void setObjectSelection(IStructuredSelection objectSelection)
-  {
-    if (objectSelection != null && !objectSelection.isEmpty())
-    {
-      Object object = objectSelection.getFirstElement();
-      if (object instanceof String)
-        setJavaBeanName((String)object);
-    }
-  }	
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/LiteralSupportMessageTask.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/LiteralSupportMessageTask.java
deleted file mode 100644
index 4e3f342..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/LiteralSupportMessageTask.java
+++ /dev/null
@@ -1,87 +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.axis.creation.ui.task;
-
-
-
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.command.env.core.common.StatusException;
-
-
-
-public class LiteralSupportMessageTask extends SimpleCommand {
-
-	private final String LABEL = "TASK_LABEL_LITERAL_SUPPORT_MESSAGE";
-	private final String DESCRIPTION =
-		"TASK_DESC_LITERAL_SUPPORT_MESSAGE";
-	private MessageUtils msgUtils_;
-	private MessageUtils coreMsgUtils_;
-
-	private JavaWSDLParameter javaWSDLParam_;
-
-	public LiteralSupportMessageTask() {
-	    String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
-	    msgUtils_ = new MessageUtils(pluginId+".plugin", this);
-	    coreMsgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.core.consumption", this );
-	    setDescription(msgUtils_.getMessage(DESCRIPTION));
-	    setName(msgUtils_.getMessage(LABEL));	
-	}
-	
-	public LiteralSupportMessageTask(JavaWSDLParameter javaWSDLParam) {
-	    String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
-	    msgUtils_ = new MessageUtils(pluginId+".plugin", this);
-	    coreMsgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.core.consumption", this );
-	    setDescription(msgUtils_.getMessage(DESCRIPTION));
-	    setName(msgUtils_.getMessage(LABEL));	
-		javaWSDLParam_ = javaWSDLParam;
-
-	}
-
-
-	/**
-	* Execute LiteralSupportMessageTask
-	*/
-	public Status execute(Environment env) {
-        Status status = new SimpleStatus("");
-		if (javaWSDLParam_ == null) {
-		    status = new SimpleStatus("",coreMsgUtils_.getMessage("MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET"), Status.ERROR);
-		    env.getStatusHandler().reportError(status);
-		    return status;
-		}
-
-		String use = javaWSDLParam_.getUse();
-		if(use != null && 
-			use.equals(JavaWSDLParameter.USE_LITERAL)){
-		    status = new SimpleStatus("",msgUtils_.getMessage("MSG_ERROR_LITERAL_SUPPORT_MESSAGE"), Status.WARNING);
-		    try
-			{
-		    	env.getStatusHandler().report(status);
-		    }
-		    catch(StatusException se)
-			{
-		    	status = new SimpleStatus("","User aborted",Status.ERROR);
-		    }
-		}
-		
-		return status;
-	}
-
-	public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam)
-	{
-		javaWSDLParam_ = javaWSDLParam;
-	}
-	
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/MoveDeploymentFilesTask.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/MoveDeploymentFilesTask.java
deleted file mode 100644
index 1d8bc1b..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/MoveDeploymentFilesTask.java
+++ /dev/null
@@ -1,129 +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.creation.ui.task;
-
-
-import java.io.File;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jst.j2ee.internal.project.IWebNatureConstants;
-import org.eclipse.jst.j2ee.internal.web.operations.J2EEWebNatureRuntime;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.consumption.util.FileUtil;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-
-public class MoveDeploymentFilesTask extends SimpleCommand {
-
-	private final String LABEL = "TASK_LABEL_MOVE_DEPLOYMENT_FILES";
-	private final String DESCRIPTION = "TASK_DESC_MOVE_DEPLOYMENT_FILES";
-	private final String WEB_INF = "WEB-INF";	//$NON-NLS-1$
-	private final String META_INF = "META-INF";	//$NON-NLS-1$
-
-	private MessageUtils msgUtils_;
-	private MessageUtils coreMsgUtils_;
-	private IProject serverProject;
-  private JavaWSDLParameter javaWSDLParam_;
-	
-	public MoveDeploymentFilesTask()
-  {
-    String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
-    msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-    coreMsgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.core.consumption", this );
-    setDescription(msgUtils_.getMessage(DESCRIPTION));
-    setName(msgUtils_.getMessage(LABEL));
-  }
-
-  /**
-	* Execute DefaultsForJavaToWSDLTask
-	*/
-	public Status execute(Environment env) {
-		Status status = new SimpleStatus("");
-		if (javaWSDLParam_ == null) {
-		  status = new SimpleStatus("",coreMsgUtils_.getMessage("MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET"), Status.ERROR);
-		  env.getStatusHandler().reportError(status);
-		  return status;
-		}
-
-		IProject project = serverProject;
-		String projectURL = ResourceUtils.getEncodedWebProjectURL(project);
-		if (projectURL == null) {
-		    status = new SimpleStatus("",msgUtils_.getMessage("MSG_ERROR_PROJECT_URL",new String[] { project.toString()}), Status.ERROR);
-		    env.getStatusHandler().reportError(status);
-		    return status;		  
-		} else {
-			javaWSDLParam_.setProjectURL(projectURL);
-		}
-
-		try {
-			if (!project.hasNature(IWebNatureConstants.J2EE_NATURE_ID))
-				return status;
-		} catch (Exception ex) {
-		  status = new SimpleStatus("",msgUtils_.getMessage("MSG_ERROR_INTERAL"), Status.ERROR, ex);
-		  env.getStatusHandler().reportError(status);
-		  return status;		  
-		}
-		String[] deployFiles = javaWSDLParam_.getDeploymentFiles();
-		String javaOutput = javaWSDLParam_.getJavaOutput();
-
-		if (deployFiles == null || javaOutput == null) {
-			return status;
-		}
-
-
-		IPath webinfPath = project.getLocation();
-		try {
-
-			if (project.hasNature(IWebNatureConstants.J2EE_NATURE_ID)) {
-				J2EEWebNatureRuntime webProject =
-					(J2EEWebNatureRuntime) project.getNature(
-						IWebNatureConstants.J2EE_NATURE_ID);
-				webinfPath = webinfPath.append(webProject.getWEBINFPath());
-			}
-			for (int i = 0; i < deployFiles.length; i++) {
-        File f = new File(deployFiles[i]);
-        String resourceToMove = f.getName();
-				String targetFileName = webinfPath.addTrailingSeparator().append(resourceToMove).toString();
-				FileUtil.createTargetFile(deployFiles[i], targetFileName, true);
-				File deploymentFile = new File(deployFiles[i]);
-				deploymentFile.delete();
-				deployFiles[i] = targetFileName;
-			}
-
-		} catch (Exception e) {
-		  status = new SimpleStatus("",msgUtils_.getMessage("MSG_ERROR_MOVE_RESOURCE",new String[] { e.getLocalizedMessage()}), Status.ERROR, e);
-		  env.getStatusHandler().reportError(status);
-		  return status;		  
-		}
-		
-		return status;
-	}
-
-	public JavaWSDLParameter getJavaWSDLParam()
-	{
-		return javaWSDLParam_;
-	}
-	
-	public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam)
-	{
-		javaWSDLParam_ = javaWSDLParam;
-	}
-	
-	public void setServerProject(IProject serverProject)
-	{
-	  this.serverProject = serverProject;
-	}
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/MoveJavaFilesTask.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/MoveJavaFilesTask.java
deleted file mode 100644
index bed83a7..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/MoveJavaFilesTask.java
+++ /dev/null
@@ -1,148 +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.creation.ui.task;
-
-
-import java.io.File;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-
-
-public class MoveJavaFilesTask extends SimpleCommand {
-
-	private final String LABEL = "TASK_LABEL_MOVE_JAVA_FILES";
-	private final String DESCRIPTION = "TASK_DESC_MOVE_JAVA_FILES";
-
-	private JavaWSDLParameter javaWSDLParam_;
-	private MessageUtils msgUtils_;
-	private MessageUtils coreMsgUtils_;
-	private IProject serviceProject_;
-	// rm private Model model_;
-
-	public MoveJavaFilesTask() {
-	    String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
-	    msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-	    coreMsgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.core.consumption", this );
-	    setDescription(msgUtils_.getMessage(DESCRIPTION));
-	    setName(msgUtils_.getMessage(LABEL));	  
-	}
-	
-
-	public MoveJavaFilesTask(JavaWSDLParameter javaWSDLParam) {
-	    String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
-	    msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-	    coreMsgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.core.consumption", this );
-	    setDescription(msgUtils_.getMessage(DESCRIPTION));
-	    setName(msgUtils_.getMessage(LABEL));	  
-		javaWSDLParam_ = javaWSDLParam;
-
-	}
-
-	/**
-	* Execute DefaultsForJavaToWSDLTask
-	*/
-	public Status execute(Environment env) {
-	  
-	  // rm 
-	  /*
-	  //Begin Setters
-	  WebServiceElement wse =
-			WebServiceElement.getWebServiceElement(model_);
-	  setServiceProject(wse.getServiceProject());
-	  //End Setters
-	  */
-	  Status status = new SimpleStatus("");
-	  
-		if (javaWSDLParam_ == null) {
-		  status = new SimpleStatus("",coreMsgUtils_.getMessage("MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET"), Status.ERROR);
-		  env.getStatusHandler().reportError(status);
-		  return status;		  
-		}
-
-		// rm 
-		/*
-		if (model_ == null) {
-		  status = new SimpleStatus("",msgUtils_.getMessage("MSG_ERROR_MODEL_NOT_SET"), Status.ERROR);
-		  return status;		  
-		}
-		*/
-
-		IProject project = serviceProject_;
-		String projectURL = ResourceUtils.getEncodedWebProjectURL(project);
-		if (projectURL == null) {
-		    status = new SimpleStatus("",msgUtils_.getMessage("MSG_ERROR_PROJECT_URL",new String[] {project.toString()}), Status.ERROR);
-		    env.getStatusHandler().reportError(status);
-		    return status;		  
-
-		} else {
-			javaWSDLParam_.setProjectURL(projectURL);
-		}
-
-		String[] javaFiles = javaWSDLParam_.getJavaFiles();
-		String javaoutput = javaWSDLParam_.getJavaOutput();  // <webproject>/JavaSource
-		String output = javaWSDLParam_.getOutput();  		 // <webproject>/WebContent/META_INF
-
-		if(javaFiles == null || javaoutput == null && output == null ){
-			return status;
-		}
-		try {
-			for (int i = 0; i < javaFiles.length; i++) {
-				String resourceToMove = javaFiles[i].substring(output.length());
-				String targetFileName = javaoutput + resourceToMove;
-				File resultFile = new File(targetFileName);
-				// copy java files that without overwtriting existing ones
-//				if (!resultFile.exists()) {
-//					FileUtil.createTargetFile(
-//						javaFiles[i],
-//						javaoutput + resourceToMove);
-//				}
-				// delete java files from the output directory
-				File source = new File(javaFiles[i]);
-				source.delete();
-			}
-		} catch (Exception e) {
-		  status = new SimpleStatus("",msgUtils_.getMessage("MSG_ERROR_MOVE_RESOURCE",new String[]{e.getLocalizedMessage()}), Status.ERROR, e);
-		  env.getStatusHandler().reportError(status);
-		  return status;		  
-		}
-		
-		return status;
-	}
-
-	public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam)
-	{
-		javaWSDLParam_ = javaWSDLParam;
-	}
-	
-	public JavaWSDLParameter getJavaWSDLParam() {
-		return javaWSDLParam_;
-	}
-	
-	public void setServiceProject(IProject serviceProject)
-	{
-	  serviceProject_ = serviceProject;
-	}
-	
-	// rm
-	/*
-	public void setModel(Model model)
-	{
-	  model_ = model;
-	}
-	*/
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/Skeleton2WSDLCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/Skeleton2WSDLCommand.java
deleted file mode 100644
index cf1a559..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/Skeleton2WSDLCommand.java
+++ /dev/null
@@ -1,288 +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.axis.creation.ui.task;
-
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import javax.wsdl.Binding;
-import javax.wsdl.Definition;
-import javax.wsdl.Port;
-import javax.wsdl.Service;
-import javax.wsdl.extensions.soap.SOAPAddress;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.j2ee.internal.ejb.project.EJBNatureRuntime;
-import org.eclipse.jst.j2ee.internal.project.IEJBNatureConstants;
-import org.eclipse.jst.j2ee.internal.project.IWebNatureConstants;
-import org.eclipse.jst.j2ee.internal.web.operations.J2EEWebNatureRuntime;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.consumption.util.FileUtil;
-import org.eclipse.jst.ws.internal.axis.consumption.util.PlatformUtils;
-import org.eclipse.jst.ws.internal.axis.consumption.util.WSDLUtils;
-import org.eclipse.jst.ws.internal.axis.creation.ui.plugin.WebServiceAxisCreationUIPlugin;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.command.common.CopyWSDLCommand;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.command.env.ui.eclipse.EclipseEnvironment;
-import org.eclipse.wst.ws.parser.wsil.WebServicesParser;
-
-public class Skeleton2WSDLCommand extends SimpleCommand
-{
-  private static final String LABEL = "TASK_LABEL_SKELETON_WSDL";
-  private static final String DESCRIPTION = "TASK_DESC_SKELETON_WSDL";
-  private static final String IMPL = "Impl";	//$NON-NLS-1$
-  private static final String SERVICE_EXT = "/services/";	//$NON-NLS-1$
-  private static final String WSDL_EXT = "wsdl";	//$NON-NLS-1$
-  private static final String DOT = ".";	//$NON-NLS-1$
-  private static final String SLASH = "/";	//$NON-NLS-1$
-  private static final String PROTOCOL_SUFFIX = "://";	//$NON-NLS-1$
-  private final String WSDL_FOLDER = "wsdl"; //$NON-NLS-1$
-  private WebServicesParser webServicesParser;
-  private JavaWSDLParameter javaWSDLParam;
-  private IProject serverProject;
-  private HashMap visitedLinks;
-  private MessageUtils msgUtils_;
-
-  public Skeleton2WSDLCommand() {
-    super(WebServiceAxisCreationUIPlugin.getMessage(LABEL), WebServiceAxisCreationUIPlugin.getMessage(DESCRIPTION));
-	msgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.creation.ui.plugin", this );
-    setName( LABEL );
-    setDescription( DESCRIPTION );
-  }
-
-  /**
-  * Execute Skeleton2WSDLCommand
-  */
-  public Status execute(Environment env)
-  {
-    if (!(env instanceof EclipseEnvironment))
-    {
-      Status status = new SimpleStatus(WebServiceAxisCreationUIPlugin.ID, msgUtils_.getMessage("MSG_ERROR_NOT_IN_ECLIPSE_ENVIRONMENT", new String[] {"Skeleton2WSDLCommand"}), Status.ERROR, null);
-      env.getStatusHandler().reportError(status);
-      return status;
-    }
-    if (javaWSDLParam == null)
-    {
-      Status status = new SimpleStatus(WebServiceAxisCreationUIPlugin.ID, msgUtils_.getMessage("MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET"), Status.ERROR, null);
-      env.getStatusHandler().reportError(status);
-      return status;
-    }
-
-  // Read WSDL
-  Definition definition = null;
-	String wsdlURL = javaWSDLParam.getInputWsdlLocation();
-	try
-	{
-		URL url = new URL(wsdlURL);
-		definition = webServicesParser.getWSDLDefinition(url.toString());
-	}
-	catch(MalformedURLException e)
-	{
-		wsdlURL = PlatformUtils.getFileURLFromPath(new Path(wsdlURL));
-		definition = webServicesParser.getWSDLDefinition(wsdlURL);
-	}
-
-    // Compute the qualified name of the Java bean skeleton
-    Service service = null;
-    Port port = null;
-    if (definition != null) {
-      StringBuffer beanName = new StringBuffer();
-      beanName.append(WSDLUtils.getPackageName(definition));
-      beanName.append(DOT);
-      try{
-      service = (Service) definition.getServices().values().iterator().next();
-      port = (Port) service.getPorts().values().iterator().next();
-      Binding binding = port.getBinding();
-      beanName.append(binding.getQName().getLocalPart());
-      beanName.append(IMPL);
-      javaWSDLParam.setBeanName(beanName.toString());
-
-      javaWSDLParam.setPortTypeName(WSDLUtils.getPortTypeName(definition));
-      javaWSDLParam.setServiceName(
-        WSDLUtils.getServiceElementName(definition));
-      javaWSDLParam.setBeanPackage(WSDLUtils.getPackageName(definition));
-      }
-      catch(Throwable e){
-      	e.printStackTrace();
-      }
-    } 
-    else {
-      Status status = new SimpleStatus(WebServiceAxisCreationUIPlugin.ID, msgUtils_.getMessage("MSG_ERROR_WSDL_NO_DEFINITION", new String[] {wsdlURL}), Status.ERROR, null);
-      env.getStatusHandler().reportError(status);
-      return status;
-    }
-
-    // Modify WSDL endpoint
-    if (port == null) {
-      Status status = new SimpleStatus(WebServiceAxisCreationUIPlugin.ID, msgUtils_.getMessage("MSG_ERROR_WSDL_NO_PORT", new String[] {wsdlURL}), Status.ERROR, null);
-      env.getStatusHandler().reportError(status);
-      return status;
-    }
-    Map services = definition.getServices();
-    for (Iterator servicesIt = services.values().iterator(); servicesIt.hasNext();)
-    {
-      Service s = (Service)servicesIt.next();
-      Map ports = s.getPorts();
-      for (Iterator portsIt = ports.values().iterator(); portsIt.hasNext();)
-      {
-        Port p = (Port)portsIt.next();
-        modifyEndpoint(p);
-      }
-    }
-
-    visitedLinks = new HashMap();
-
-    // Set WSDL file name: javaWSDLParam.setOutputWsdlLocation();
-    IWorkspaceRoot workspace = ResourcesPlugin.getWorkspace().getRoot();
-
-    String wsdlLocation = javaWSDLParam.getOutputWsdlLocation();
-    IPath wsdlPath = null;
-    IFile outputFile = null;
-    try {
-     if(wsdlLocation != null){
-		outputFile = workspace.getFileForLocation( new Path(wsdlLocation));
-     }
-     else{
-		wsdlPath = serverProject.getFullPath();
-		if (serverProject.hasNature(IWebNatureConstants.J2EE_NATURE_ID)) {
-			   J2EEWebNatureRuntime webProject =
-				 (J2EEWebNatureRuntime) serverProject.getNature(
-				   IWebNatureConstants.J2EE_NATURE_ID);
-			   wsdlPath = webProject.getWebModulePath();
-			   //wsdlPath = wsdlPath.append(webProject.getWEBINFPath());
-			 }
-		else if (serverProject.hasNature(IEJBNatureConstants.NATURE_ID))
-		{
-			EJBNatureRuntime ejbProject = EJBNatureRuntime.getRuntime(serverProject);
-			wsdlPath = wsdlPath.append(ejbProject.getMetaFolder().getProjectRelativePath().addTrailingSeparator());
-		}		
-
-			 IPath wsdlFilePath = wsdlPath.append(WSDL_FOLDER).append(port.getName()).addFileExtension(WSDL_EXT);
-		     IFolder folder = ResourceUtils
-								.getWorkspaceRoot()
-								.getFolder(wsdlPath.append(WSDL_FOLDER));
-			 FileUtil.createFolder(folder, true, true);	
-		     outputFile = workspace.getFile(wsdlFilePath);
-			 wsdlLocation = outputFile.getLocation().toString();
-			 javaWSDLParam.setOutputWsdlLocation(wsdlLocation);
-			 
-     }
-
-     // copy WSDL
-     CopyWSDLCommand copyWSDLCommand = new CopyWSDLCommand();
-     copyWSDLCommand.setWebServicesParser(webServicesParser);
-     copyWSDLCommand.setWsdlURI(wsdlURL);
-     copyWSDLCommand.setDestinationURI(outputFile.getLocation().toFile().toURL().toString());
-     copyWSDLCommand.setDefinition(definition);
-     Status status = copyWSDLCommand.execute(env);
-     if(status!=null && status.getSeverity()==Status.ERROR) {
-       return status;
-     }
-    } 
-    catch (Exception e) {
-      Status status = new SimpleStatus(WebServiceAxisCreationUIPlugin.ID, msgUtils_.getMessage("MSG_ERROR_WRITE_WSDL", new String[] { wsdlLocation }), Status.ERROR, e);
-      env.getStatusHandler().reportError(status);
-      return status;
-    }
-    return new SimpleStatus("");
-  }
-
-  private Status modifyEndpoint(Port port)
-  {
-    Iterator it = port.getExtensibilityElements().iterator();
-    SOAPAddress soapAddress = null;
-    while (it.hasNext())
-    {
-      Object obj = it.next();
-      if (obj instanceof SOAPAddress)
-      {
-        soapAddress = (SOAPAddress)obj;
-        break;
-      }
-    }
-    if (soapAddress != null)
-    {
-      String projectURL = ResourceUtils.getEncodedWebProjectURL(serverProject);
-      if (projectURL == null)
-        return new SimpleStatus(WebServiceAxisCreationUIPlugin.ID, msgUtils_.getMessage("MSG_ERROR_PROJECT_URL", new String[] {serverProject.toString()}), Status.ERROR, null);
-      StringBuffer serviceURL = new StringBuffer(projectURL);
-      serviceURL.append(SERVICE_EXT).append(port.getName());
-      javaWSDLParam.setUrlLocation(serviceURL.toString());
-      soapAddress.setLocationURI(serviceURL.toString());
-    }
-    return new SimpleStatus("");
-  }
-  
-  /**
-  * Returns the javaWSDLParam.
-  * @return JavaWSDLParameter
-  */
-  public JavaWSDLParameter getJavaWSDLParam() {
-    return javaWSDLParam;
-  }
-
-  /**
-  * Sets the javaWSDLParam.
-  * @param javaWSDLParam The javaWSDLParam to set
-  */
-  public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam) {
-    this.javaWSDLParam = javaWSDLParam;
-  }
-
-  /**
-   * @param serverProject The serverProject to set.
-   */
-  public void setServerProject(IProject serverProject) {
-    this.serverProject = serverProject;
-  }
-
-  /**
-   * @return Returns the webServicesParser.
-   */
-  public WebServicesParser getWebServicesParser() {
-    return webServicesParser;
-  }
-
-  /**
-   * @param webServicesParser The webServicesParser to set.
-   */
-  public void setWebServicesParser(WebServicesParser webServicesParser) {
-    this.webServicesParser = webServicesParser;
-  }
-  
-  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.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/TDCheckAxisDeploymentDescriptors.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/TDCheckAxisDeploymentDescriptors.java
deleted file mode 100644
index d852abd..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/TDCheckAxisDeploymentDescriptors.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.eclipse.jst.ws.internal.axis.creation.ui.task;
-
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.CheckAxisDeploymentDescriptorsTask;
-
-public class TDCheckAxisDeploymentDescriptors extends CheckAxisDeploymentDescriptorsTask 
-{
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/UpdateAxisWSDDFileTask.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/UpdateAxisWSDDFileTask.java
deleted file mode 100644
index ef2046b..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/UpdateAxisWSDDFileTask.java
+++ /dev/null
@@ -1,230 +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.creation.ui.task;
-
-
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.transform.stream.StreamSource;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IPluginDescriptor;
-import org.eclipse.core.runtime.IPluginRegistry;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jst.j2ee.internal.project.IWebNatureConstants;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.consumption.util.FileUtil;
-import org.eclipse.jst.ws.internal.axis.creation.ui.plugin.WebServiceAxisCreationUIPlugin;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-
-public class UpdateAxisWSDDFileTask extends SimpleCommand {
-	
-	
-	private final String LABEL = "TASK_LABEL_UPDATE_AXIS_WSDD";	
-	private final String DESCRIPTION = "TASK_DESC_UPDATE_AXIS_WSDD";
-	private final String DEPLOY_XSL = "deploy.xsl";	//$NON-NLS-1$
-	private final String DEPLOY_BAK = "deploy.wsdd.bak";		//$NON-NLS-1$
-	private final String CLASSNAME_PARAM = "newClassName";		//$NON-NLS-1$
-    private MessageUtils msgUtils_;
-    private MessageUtils coreMsgUtils_;
-	private JavaWSDLParameter javaWSDLParam_;
-	private IProject serviceProject_;
-	// rm private Model model_;
-
-	public UpdateAxisWSDDFileTask() {
-	    String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
-	    msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-	    coreMsgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.core.consumption", this );
-	    setDescription(msgUtils_.getMessage(DESCRIPTION));
-	    setName(msgUtils_.getMessage(LABEL));	    
-	}
-	
-	public UpdateAxisWSDDFileTask(JavaWSDLParameter javaWSDLParam) {
-	    String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
-	    msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-	    coreMsgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.core.consumption", this );
-	    setDescription(msgUtils_.getMessage(DESCRIPTION));
-	    setName(msgUtils_.getMessage(LABEL));	    
-		javaWSDLParam_ = javaWSDLParam;
-	}
-
-	/**
-	* Execute UpdateAxisWSDDFileTask
-	*/
-	public Status execute(Environment env) {
-	  
-	  // rm
-	  /*
-	  //Begin Setters
-	  WebServiceElement wse =
-		WebServiceElement.getWebServiceElement(model_);
-	  setServiceProject(wse.getServiceProject());
-	  //End Setters
-	  */
-	    Status status = new SimpleStatus("");		
-		if (javaWSDLParam_ == null) {
-		  status = new SimpleStatus("",coreMsgUtils_.getMessage("MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET"), Status.ERROR);
-		  env.getStatusHandler().reportError(status);
-		  return status;		  
-		}
-
-		// rm 
-		/*
-		if (model_ == null) {
-		  status = new SimpleStatus("",msgUtils_.getMessage("MSG_ERROR_MODEL_NOT_SET"), Status.ERROR);
-		  return status;		  
-		}
-		*/
-	
-		IProject project = serviceProject_;
-		String projectURL = ResourceUtils.getEncodedWebProjectURL(project);
-		if (projectURL == null) {
-		    status = new SimpleStatus("",msgUtils_.getMessage("MSG_ERROR_PROJECT_URL",new String[] {project.toString()}), Status.ERROR);
-		    env.getStatusHandler().reportError(status);
-		    return status;		  
-		} else {
-			javaWSDLParam_.setProjectURL(projectURL);
-		}
-		String outputLocation = javaWSDLParam_.getJavaOutput();
-		if (outputLocation == null) {
-			return status;
-		}
-		try {
-			if (!project.hasNature(IWebNatureConstants.J2EE_NATURE_ID))
-				return status;
-		} catch (Exception ex) {
-		    status = new SimpleStatus("",msgUtils_.getMessage("MSG_ERROR_INTERAL"), Status.ERROR, ex);
-		    env.getStatusHandler().reportError(status);
-		    return status;		  
-		}
-		String[] javaFiles = javaWSDLParam_.getJavaFiles();
-		String javaoutput = javaWSDLParam_.getJavaOutput();
-		String output = javaWSDLParam_.getOutput();
-
-//		String webContentPath =	ResourceUtils.getWebModuleServerRoot(project).getLocation().toString();
-		String webContentPath =	J2EEUtils.getFirstWebContentContainer(project).getLocation().toString();
-		try {
-
-			if (javaWSDLParam_.getDeploymentFiles() != null
-				&& javaWSDLParam_.getDeploymentFiles().length > 0) {
-
-				String wsdd_deploy = javaWSDLParam_.getDeploymentFiles()[0];
-				Path deployPath = new Path(wsdd_deploy);
-				String deployBackup =
-					deployPath
-						.removeLastSegments(1)
-						.append(DEPLOY_BAK)
-						.toString();
-				FileUtil.createTargetFile(wsdd_deploy, deployBackup, true);
-				String deployXSL = getPluginFilePath(DEPLOY_XSL).toString();
-
-				TransformerFactory tFactory = TransformerFactory.newInstance();
-
-				// Use the TransformerFactory to instantiate a Transformer that will work with  
-				// the stylesheet you specify. This method call also processes the stylesheet
-				// into a compiled Templates object.
-				Transformer transformer =
-					tFactory.newTransformer(new StreamSource(deployXSL));
-				transformer.setParameter(CLASSNAME_PARAM, javaWSDLParam_.getBeanName());
-
-				// Use the Transformer to apply the associated Templates object to an XML document
-				// (foo.xml) and write the output to a file (foo.out).
-				transformer.transform(
-					new StreamSource(deployBackup),
-					new StreamResult(new FileOutputStream(wsdd_deploy)));
-
-			}
-
-		} catch (Exception e) {
-		    String[] errorMsgStrings = new String[]{project.toString(), outputLocation.toString(), webContentPath.toString()}; 
-		    status = new SimpleStatus("",msgUtils_.getMessage("MSG_ERROR_UPDATE_AXIS_WSDD", errorMsgStrings), Status.ERROR, e);
-		    env.getStatusHandler().reportError(status);
-		    return status;		  		  
-		}
-		
-		return status;
-	}
-
-	private IPath getPluginFilePath(String pluginfileName)
-		throws CoreException {
-		try {
-			IPluginRegistry pluginRegistry = Platform.getPluginRegistry();
-			IPluginDescriptor pluginDescriptor =
-				pluginRegistry.getPluginDescriptor(WebServiceAxisCreationUIPlugin.ID);
-
-			URL localURL =
-				Platform.asLocalURL(
-					new URL(pluginDescriptor.getInstallURL(), pluginfileName));
-			return new Path(localURL.getFile());
-		} catch (MalformedURLException e) {
-			throw new CoreException(
-				new org.eclipse.core.runtime.Status(
-					IStatus.WARNING,
-					WebServiceAxisCreationUIPlugin.ID,
-					0,
-					msgUtils_.getMessage(
-						"MSG_PLUGIN_FILE_URL"),
-					e));
-		} catch (IOException e) {
-			throw new CoreException(
-				new org.eclipse.core.runtime.Status(
-					IStatus.WARNING,
-					WebServiceAxisCreationUIPlugin.ID,
-					0,
-					msgUtils_.getMessage(
-						"MSG_PLUGIN_FILE_URL"),
-					e));
-		}
-	}
-
-
-	/**
-	* Sets the javaWSDLParam.
-	* @param javaWSDLParam The javaWSDLParam to set
-	*/
-	public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam) {
-		javaWSDLParam_ = javaWSDLParam;
-	}
-	
-	public JavaWSDLParameter getJavaWSDLParam()
-	{
-		return javaWSDLParam_;
-	}	
-
-	public void setServiceProject(IProject serviceProject)
-	{
-	  serviceProject_ = serviceProject;
-	}
-	
-	// rm 
-	/*
-	public void setModel(Model model)
-	{
-	  model_ = model;
-	}
-	*/	
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/AxisBeanFragment.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/AxisBeanFragment.java
deleted file mode 100644
index 8cfc254..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/AxisBeanFragment.java
+++ /dev/null
@@ -1,209 +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.axis.creation.ui.widgets.bean;
-
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.AxisDeployCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.Java2WSDLCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.WSDL2JavaCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.AddJarsToProjectBuildPathTask;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.CheckAxisDeploymentDescriptorsTask;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.CopyAxisJarCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.RefreshProjectCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.command.JavaToWSDLMethodCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.command.UpdateWEBXMLCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.DefaultsForServerJavaWSDLCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.LiteralSupportMessageTask;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.MoveJavaFilesTask;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.UpdateAxisWSDDFileTask;
-import org.eclipse.jst.ws.internal.common.StringToIProjectTransformer;
-import org.eclipse.jst.ws.internal.consumption.command.common.BuildProjectCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.StartProjectCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.command.WSINonCompliantRuntimeCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionOutputCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ObjectSelectionOutputCommand;
-import org.eclipse.wst.command.env.common.WaitForAutoBuildCommand;
-import org.eclipse.wst.command.env.core.common.Condition;
-import org.eclipse.wst.command.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.env.core.fragment.BooleanFragment;
-import org.eclipse.wst.command.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.env.ui.widgets.SelectionCommand;
-
-  
-public class AxisBeanFragment extends SequenceFragment
-{
- 
-  public AxisBeanFragment()
-  {
-    add( new SimpleFragment( new ValidateObjectSelectionCommand(), ""));
-    add( new SimpleFragment( new BUAxisDefaultingCommand(), "" ) );
-    add( new BUAxisCommandsFragment1());
-    add( new BUAxisCommandsFragment2());
-    add( new SimpleFragment( "BeanConfig"    ) );
-    add( new MappingFragment() );
-    add( new BUAxisCommandsFragment3());
-  }
-  
-  public void registerDataMappings(DataMappingRegistry registry) 
-  {
-    //ValidateObjectSelectionCommand
-    registry.addMapping(ObjectSelectionOutputCommand.class, "ObjectSelection", ValidateObjectSelectionCommand.class);
-    registry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", ValidateObjectSelectionCommand.class,"ServiceProjectName", null );
-    
-    //BUAxisDefaultingCommand
-    registry.addMapping(SelectionCommand.class, "InitialSelection", BUAxisDefaultingCommand.class );
-    registry.addMapping(ServerExtensionDefaultingCommand.class, "ServiceTypeRuntimeServer", BUAxisDefaultingCommand.class );
-    
-    //WSINonCompliantRuntimeCommand
-    registry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", WSINonCompliantRuntimeCommand.class, "ServiceProject", new StringToIProjectTransformer());
-    
-    //BUAxisCommands2 - these run after BeanClassWidget
-    //DefaultsForServerJavaWSDLCommand
-    registry.addMapping(BUAxisDefaultingCommand.class, "JavaWSDLParam", DefaultsForServerJavaWSDLCommand.class);
-    registry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", DefaultsForServerJavaWSDLCommand.class, "ServiceProject", new StringToIProjectTransformer());
-    registry.addMapping(BUAxisDefaultingCommand.class, "JavaBeanName", DefaultsForServerJavaWSDLCommand.class);
-    registry.addMapping(BUAxisDefaultingCommand.class, "Parser", DefaultsForServerJavaWSDLCommand.class);
-    registry.addMapping(BUAxisDefaultingCommand.class, "CustomizeServiceMappings", AxisBeanFragment.MappingFragment.class);
-    
-    //JavaWSDLMethodCommand
-    registry.addMapping(DefaultsForServerJavaWSDLCommand.class, "JavaWSDLParam", JavaToWSDLMethodCommand.class);
-    registry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", JavaToWSDLMethodCommand.class, "ServiceProject", new StringToIProjectTransformer());
-
-    // BUAxisCommands3 - these run after BeanConfigWidget
-    //LiteralSupportMessageTask
-    registry.addMapping(JavaToWSDLMethodCommand.class, "JavaWSDLParam", LiteralSupportMessageTask.class);
-    
-    //CheckAxisDeploymentDescriptorsTask
-    //registry.addMapping(JavaToWSDLMethodCommand.class, "JavaWSDLParam", CheckAxisDeploymentDescriptorsTask.class);
-    registry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", CheckAxisDeploymentDescriptorsTask.class, "ServerProject", new StringToIProjectTransformer());
-    
-    //CopyAxisJarCommand
-    registry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", CopyAxisJarCommand.class, "Project", new StringToIProjectTransformer());
-    
-    //AddJarsToProjectBuildPathTask
-    registry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", AddJarsToProjectBuildPathTask.class, "Project", new StringToIProjectTransformer());
-    
-    //Java2WSDLCommand
-    registry.addMapping(JavaToWSDLMethodCommand.class, "JavaWSDLParam", Java2WSDLCommand.class);
-    
-    //RefreshProjectCommand
-    registry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", RefreshProjectCommand.class, "Project", new StringToIProjectTransformer());
-    
-    //WSDL2JavaCommand
-    registry.addMapping(JavaToWSDLMethodCommand.class, "JavaWSDLParam", WSDL2JavaCommand.class);
-    
-
-    //MoveJavaFilesTask
-    registry.addMapping(WSDL2JavaCommand.class, "JavaWSDLParam", MoveJavaFilesTask.class);
-    registry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", MoveJavaFilesTask.class, "ServiceProject", new StringToIProjectTransformer());
-    
-    //UpdateAxisWSDDFileTask
-    registry.addMapping(MoveJavaFilesTask.class, "JavaWSDLParam", UpdateAxisWSDDFileTask.class);
-    registry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", UpdateAxisWSDDFileTask.class, "ServiceProject", new StringToIProjectTransformer());
-    
-    //UpdateWEBXMLCommand
-    registry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", UpdateWEBXMLCommand.class, "ServerProject", new StringToIProjectTransformer());
-    
-    //BuildProjectCommand
-    registry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", BuildProjectCommand.class, "Project", new StringToIProjectTransformer());
-    registry.addMapping(BUAxisDefaultingCommand.class, "ForceBuild", BuildProjectCommand.class);
-    registry.addMapping(BUAxisDefaultingCommand.class, "ValidationManager", BuildProjectCommand.class);
-    
-    //StartProjectCommand
-    registry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", StartProjectCommand.class, "ServiceProject", new StringToIProjectTransformer());    
-    registry.addMapping(BUAxisDefaultingCommand.class, "SampleProject", StartProjectCommand.class);
-    registry.addMapping(BUAxisDefaultingCommand.class, "ServiceServerTypeID", StartProjectCommand.class);
-    registry.addMapping(BUAxisDefaultingCommand.class, "SampleServerTypeID", StartProjectCommand.class);
-    registry.addMapping(BUAxisDefaultingCommand.class, "ServiceExistingServer", StartProjectCommand.class);
-    registry.addMapping(BUAxisDefaultingCommand.class, "SampleExistingServer", StartProjectCommand.class);
-    registry.addMapping(BUAxisDefaultingCommand.class, "IsWebProjectStartupRequested",StartProjectCommand.class);
-        
-    //AxisDeployCommand
-    registry.addMapping(UpdateAxisWSDDFileTask.class, "JavaWSDLParam", AxisDeployCommand.class);
-    
-    //CopyAxisServerConfigTask
-    /*
-    registry.addMapping(UpdateAxisWSDDFileTask.class, "JavaWSDLParam", CopyAxisServerConfigTask.class);
-    registry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", CopyAxisServerConfigTask.class, "ServiceProject", new StringToIProjectTransformer());
-    registry.addMapping(BUAxisDefaultingCommand.class, "ServiceExistingServer", CopyAxisServerConfigTask.class);
-    registry.addMapping(BUAxisDefaultingCommand.class, "ServiceServerTypeID", CopyAxisServerConfigTask.class);
-    */
-    
-    // ServerExtensionOutputCommand
-    registry.addMapping(Java2WSDLCommand.class, "WsdlURI", ServerExtensionOutputCommand.class);    
-  }
-  
-  private class BUAxisCommandsFragment1 extends SequenceFragment
-  {    
-    public BUAxisCommandsFragment1()
-    {
-      add(new SimpleFragment(new WSINonCompliantRuntimeCommand(), ""));
-    }
-  }
-  
-  private class BUAxisCommandsFragment2 extends SequenceFragment
-  {
-    public BUAxisCommandsFragment2()
-    {
-      add(new SimpleFragment(new DefaultsForServerJavaWSDLCommand(), ""));
-      add(new SimpleFragment(new JavaToWSDLMethodCommand(), ""));
-    }    
-  }
-  
-  private class BUAxisCommandsFragment3 extends SequenceFragment
-  {
-    public BUAxisCommandsFragment3()
-    {
-      add(new SimpleFragment(new LiteralSupportMessageTask(), ""));
-      add(new SimpleFragment(new CheckAxisDeploymentDescriptorsTask(), ""));
-      add(new SimpleFragment(new CopyAxisJarCommand(), ""));
-      add(new SimpleFragment(new AddJarsToProjectBuildPathTask(), ""));
-      add(new SimpleFragment(new WaitForAutoBuildCommand(), "" ));
-      add(new SimpleFragment(new Java2WSDLCommand(), ""));
-      add(new SimpleFragment(new RefreshProjectCommand(), ""));
-      add(new SimpleFragment(new WSDL2JavaCommand(), ""));
-      add(new SimpleFragment(new MoveJavaFilesTask(), ""));
-      add(new SimpleFragment(new UpdateAxisWSDDFileTask(), ""));
-      add(new SimpleFragment(new UpdateWEBXMLCommand(), ""));
-      add(new SimpleFragment(new RefreshProjectCommand(), ""));
-      add(new SimpleFragment(new BuildProjectCommand(), ""));
-      add(new SimpleFragment(new StartProjectCommand(), ""));
-      add(new SimpleFragment(new AxisDeployCommand(), ""));
-      //add(new SimpleFragment(new CopyAxisServerConfigTask(), ""));
-      add(new SimpleFragment(new RefreshProjectCommand(), ""));
-    }       
-  }
-  
-  public class MappingFragment extends BooleanFragment
-  {
-    private boolean showMappings_;
-    
-    public MappingFragment()
-    {
-      super();
-      
-      setTrueFragment( new SimpleFragment( "AxisServiceBeanMapping" ));
-      setCondition( new Condition()
-                    {
-                      public boolean evaluate()
-                      {
-                        return showMappings_;
-                      }
-                    } );
-    }
-    
-    public void setCustomizeServiceMappings( boolean showMappings )
-    {
-      showMappings_ = showMappings;
-    }      
-  }  
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BUAxisDefaultingCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BUAxisDefaultingCommand.java
deleted file mode 100644
index 1f35ad5..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BUAxisDefaultingCommand.java
+++ /dev/null
@@ -1,265 +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.axis.creation.ui.widgets.bean;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.common.JavaResourceFilter;
-import org.eclipse.jst.ws.internal.consumption.datamodel.validate.ValidationManager;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.ws.parser.discovery.WebServicesParserExt;
-import org.eclipse.wst.ws.parser.wsil.WebServicesParser;
-
-/**
- * 
- */
-public class BUAxisDefaultingCommand extends SimpleCommand
-{
-  //Need
-  private IStructuredSelection initialSelection_;
-  private TypeRuntimeServer serviceIds_;
-  
-  //Provide
-  private IServer serviceExistingServer_;
-  private String serviceServerTypeID_;  // rsk revisit
-  private JavaWSDLParameter javaWSDLParam_;
-  private String javaBeanName_;
-  private WebServicesParser parser_;
-  private boolean forceBuild_ = true;
-  private Boolean IsWebProjectStartupRequested = Boolean.TRUE; // rsk revisit
-  private ValidationManager validationManager_;
-  private boolean customizeServiceMappings_ = false;
-  
-  //This is proxy and client related information
-  //which can be nulled for commands dealing
-  //with service creation.
-  //rsk revisit
-  private Boolean isProxyProject_ = Boolean.FALSE;
-  private String clientRuntimeID_ = null;
-  private IProject proxyProject_ = null;
-  private IProject sampleProject_ = null;
-  private String sampleServerTypeID_ = null;
-  private IServer sampleExistingServer_ = null;
-  
-  private MessageUtils msgUtils_;
-  
-  public Status execute(Environment env)
-  {
-    
-  	String       pluginId = "org.eclipse.jst.ws.axis.creation.ui";
-    msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
-    
-//    if (serviceIds_.getServerInstanceId() != null) { // server exists
-//    	serviceExistingServer_ = ServerCore.findServer(serviceIds_.getServerInstanceId());
-//    }
-//    if (serviceExistingServer_ != null)
-//    {
-//      serviceServerTypeID_ = serviceExistingServer_.getServerType().getId();
-//    }
-//    else
-//    {
-//    	serviceServerTypeID_ = serviceIds_.getServerId();
-//      // server will be created in ServerDeployableConfigurationCommand
-//    }
-    
-    //javaWSDLParam
-    javaWSDLParam_ = new JavaWSDLParameter();
-     
-    if (initialSelection_ == null) {
-    	Status status = new SimpleStatus("BUAxisDefaultingCommand", //$NON-NLS-1$
-				msgUtils_.getMessage("MSG_ERROR_INITIAL_SELECTION"), Status.ERROR);
-		env.getStatusHandler().reportError(status);
-		return status;
-    }
-    
-    try {
-		
-		javaBeanName_ = getJavaBeanFromInitialSelection(env);
-		
-	} catch (CoreException e) {
-		Status status = new SimpleStatus("BUAxisDefaultingCommand", //$NON-NLS-1$
-				msgUtils_.getMessage("MSG_ERROR_INITIAL_SELECTION") + " " //$NON-NLS-1$
-				+e.getCause().toString(), Status.ERROR);
-		env.getStatusHandler().reportError(status);
-		return status;
-	}
-    
-    //parser
-    parser_ = new WebServicesParserExt();
-    
-    
-    
-    //validationManager
-    validationManager_ = new ValidationManager();
-    
-    return new SimpleStatus("");
-  }
-  
-  private String getJavaBeanFromInitialSelection(Environment env) throws CoreException
-  {
-    String beanClass = "";
-    JavaResourceFilter filter = new JavaResourceFilter(); 
-    IStructuredSelection selection = initialSelection_;
-    //
-    if (selection != null)
-    {
-      Object obj = selection.getFirstElement();
-      if (obj != null)
-      {
-        // get the IResource represented by the selection
-        IResource res = null;
-        
-        res = ResourceUtils.getResourceFromSelection(obj);
-        
-        if (filter.accepts(res))
-        {
-          // get the package-qualified class name without file extensions
-          String beanPackage = ResourceUtils.getJavaResourcePackageName(res.getFullPath());
-          if (beanPackage==null)
-            beanPackage = "";
-          else
-            beanPackage = beanPackage + ".";
-
-          beanClass = beanPackage + res.getName();
-
-          if (beanClass.toLowerCase().endsWith(".java") || beanClass.toLowerCase().endsWith(".class")) {
-            beanClass = beanClass.substring(0,beanClass.lastIndexOf('.'));
-          }
-        }
-      }
-    }
-    
-    //
-    return beanClass;
-  }
-  /**
-   * @return Returns the clientRuntimeID_.
-   */
-  public String getClientRuntimeID()
-  {
-    return clientRuntimeID_;
-  }
-  /**
-   * @return Returns the forceBuild_.
-   */
-  public boolean getForceBuild()
-  {
-    return forceBuild_;
-  }
-  /**
-   * @return Returns the isProxyProject_.
-   */
-  public Boolean getIsProxyProject()
-  {
-    return isProxyProject_;
-  }
-  /**
-   * @return Returns the javaBeanName_.
-   */
-  public String getJavaBeanName()
-  {
-    return javaBeanName_;
-  }
-  /**
-   * @return Returns the javaWSDLParam_.
-   */
-  public JavaWSDLParameter getJavaWSDLParam()
-  {
-    return javaWSDLParam_;
-  }
-  /**
-   * @return Returns the parser_.
-   */
-  public WebServicesParser getParser()
-  {
-    return parser_;
-  }
-  /**
-   * @return Returns the proxyProject_.
-   */
-  public IProject getProxyProject()
-  {
-    return proxyProject_;
-  }
-  /**
-   * @return Returns the sampleExistingServer_.
-   */
-  public IServer getSampleExistingServer()
-  {
-    return sampleExistingServer_;
-  }
-  /**
-   * @return Returns the sampleProject_.
-   */
-  public IProject getSampleProject()
-  {
-    return sampleProject_;
-  }
-  /**
-   * @return Returns the sampleServerTypeID_.
-   */
-  public String getSampleServerTypeID()
-  {
-    return sampleServerTypeID_;
-  }
-  /**
-   * @return Returns the validationManager_.
-   */
-  public ValidationManager getValidationManager()
-  {
-    return validationManager_;
-  }
-  
-  public void setInitialSelection(IStructuredSelection initialSelection)
-  {
-    initialSelection_ = initialSelection;
-  }
-  /**
-   * @return Returns the serviceExistingServer_.
-   */
-  public IServer getServiceExistingServer()
-  {
-    return serviceExistingServer_;
-  }
-  
-//  public String getServiceServerTypeID()
-//  {
-//    return serviceServerTypeID_;
-//  }
-  
-  public boolean getCustomizeServiceMappings()
-  {
-    return customizeServiceMappings_;
-  }
-  /**
-   * @return Returns the isWebProjectStartupRequested.
-   */
-  public Boolean getIsWebProjectStartupRequested()
-  {
-    return IsWebProjectStartupRequested;
-  }
-  
-//  public void setServiceTypeRuntimeServer(TypeRuntimeServer ids)
-//  {
-//    serviceIds_ = ids;
-//  }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BeanClassWidget.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BeanClassWidget.java
deleted file mode 100644
index 1eb8b2d..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BeanClassWidget.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.axis.creation.ui.widgets.bean;
-
-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.jface.wizard.IWizardContainer;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.common.JavaResourceFilter;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.jst.ws.internal.ui.dialog.DialogUtils;
-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.Composite;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.env.ui.widgets.WidgetDataEvents;
-
-
-public class BeanClassWidget extends SimpleWidgetDataContributor
-{
-  private String             pluginId_  = "org.eclipse.jst.ws.consumption.ui";
-  private String             thisPlugin = "org.eclipse.jst.ws.axis.creation.ui";
-  private IProject           serverProject_ = null;
-  private Composite          parent_ = null;
-  private IWizardContainer   context_ = null;
-  private JavaResourceFilter filter_ = new JavaResourceFilter();
-  private IResource          initialResource_ = null;
-  
-  /*CONTEXT_ID PBCL0001 for the Bean Selection Page*/
-  private String INFOPOP_PBCL_PAGE = "PBCL0001";
-  
-  private Text beanClassText_;
-  /*CONTEXT_ID PBCL0002 for the Bean Selection field of the Bean Selection Page*/
-  private String INFOPOP_PBCL_TEXT_BEAN_CLASS = "PBCL0002";
-
-  private Button beanClassBrowseButton_;
-  /*CONTEXT_ID PBCL0003 for the Bean Class Browse button of the Bean Selection Page*/
-  private String INFOPOP_PBCL_BUTTON_BEAN_CLASS_BROWSE = "PBCL0003";
-
-  private Button beanResourceBrowseButton_;
-  /*CONTEXT_ID PBCL0004 for the Bean Resource Browse button of the Bean Selection Page*/
-  private String INFOPOP_PBCL_BUTTON_BEAN_RESOURCE_BROWSE = "PBCL0004";
-   
-  public WidgetDataEvents addControls( Composite parent, Listener statusListener )
-  {
-    MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
-    UIUtils      uiUtils  = new UIUtils(msgUtils, thisPlugin ); 
-    
-    parent_ = parent;
-    
-    Composite group = uiUtils.createComposite( parent, 4 );
-    
-    group.setToolTipText( msgUtils.getMessage("TOOLTIP_PBCL_PAGE") );
-    PlatformUI.getWorkbench().getHelpSystem().setHelp( group, pluginId_ + "." + INFOPOP_PBCL_PAGE );
-    
-    beanClassText_ = uiUtils.createText( group, "LABEL_BEAN_CLASS_NAME",
-                                         "TOOLTIP_PBCL_TEXT_BEAN_CLASS",
-                                         INFOPOP_PBCL_TEXT_BEAN_CLASS,
-                                         SWT.SINGLE | SWT.BORDER);
-    
-    beanClassBrowseButton_ = uiUtils.createPushButton( group, "BUTTON_BROWSE_CLASSES",
-                                                       "TOOLTIP_PBCL_BUTTON_BEAN_CLASS_BROWSE",
-                                                       INFOPOP_PBCL_BUTTON_BEAN_CLASS_BROWSE );
-    beanClassBrowseButton_.addSelectionListener( new SelectionAdapter()
-                                                 {
-                                                   public void widgetSelected( SelectionEvent evt )
-                                                   {
-                                                     handleBrowseClasses();  
-                                                   }
-                                                 } );
-    
-    beanResourceBrowseButton_ = uiUtils.createPushButton( group, "BUTTON_BROWSE_FILES",
-                                                          "TOOLTIP_PBCL_BUTTON_BEAN_RESOURCE_BROWSE",
-                                                          INFOPOP_PBCL_BUTTON_BEAN_RESOURCE_BROWSE );
-    beanResourceBrowseButton_.addSelectionListener( new SelectionAdapter()
-                                                    {
-                                                      public void widgetSelected( SelectionEvent evt )
-                                                      {
-                                                        handleBrowseFiles();  
-                                                      }
-                                                    } );
-    
-    return this;
-  }
-  
-  private void handleBrowseClasses()
-  {
-    String className = DialogUtils.browseClasses( parent_.getShell(), 
-                                                  serverProject_, context_ );
-
-    if (className!=null) beanClassText_.setText(className);
-    
-  }
-  
-  private void handleBrowseFiles()
-  {
-    IResource topResource = serverProject_;
-    
-    if (topResource == null)
-    {
-      topResource = ResourceUtils.getWorkspaceRoot();
-    }
-    
-    IResource resource 
-      = DialogUtils.browseResources( parent_.getShell(),
-                                     topResource,
-				                     initialResource_,
-				                     filter_ );
-    
-    if( resource != null )
-    {
-      IPath  path     = resource.getFullPath();
-      String basename = path.lastSegment();
-      
-      if( basename != null && basename.length() > 0 )
-      {
-        String beanPackage = org.eclipse.jst.ws.internal.common.ResourceUtils.getJavaResourcePackageName(path);
-        String beanClass = (beanPackage == null ? basename : (beanPackage + "." + basename));
-        
-        if( beanClass.toLowerCase().endsWith(".java") || beanClass.toLowerCase().endsWith(".class" ) )
-        {
-          beanClass = beanClass.substring( 0, beanClass.lastIndexOf('.') );
-        }
-        
-        beanClassText_.setText(beanClass);
-      }
-    }   
-  }
-  
-  public void setCurrentPage( IWizardPage page )
-  {
-    context_ = page.getWizard().getContainer();
-  }
-
-  public void setBeanClassName(String beanClassName)
-  {
-    beanClassText_.setText(beanClassName);
-  }
-  
-  public String getBeanClassName()
-  {
-    return beanClassText_.getText().trim();  
-  }
-  
-  public void setServerProjectName( String name )
-  {
-    serverProject_ = (IProject)ResourceUtils.findResource( new Path( name ).makeAbsolute() );  
-  }
-    
-  public void setInitialResource( IResource resource )
-  {
-    initialResource_ = resource;  
-  }  
-  
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BeanConfigWidget.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BeanConfigWidget.java
deleted file mode 100644
index 28cbbe5..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BeanConfigWidget.java
+++ /dev/null
@@ -1,337 +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.axis.creation.ui.widgets.bean;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.consumption.util.PlatformUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-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.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.swt.widgets.TreeItem;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.command.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.env.ui.widgets.WidgetDataEvents;
-
-
-public class BeanConfigWidget extends SimpleWidgetDataContributor 
-{
-  private String pluginId_ = "org.eclipse.jst.ws.axis.creation.ui";
-  
-  private Button   rpcEncodedButton_;
-  private Button   rpcLiteralButton_;
-  private Button   docLiteralButton_;
-  
-  private Listener statusListener_;
-  
-  private JavaWSDLParameter javaParameter_;
-  
-  /* CONTEXT_ID PBCF0001 for the Bean Config Page */
-  private final String INFOPOP_PBCF_PAGE = "PBCF0001"; //$NON-NLS-1$
-  private final String TOOLTIP_PBCF_PAGE = "TOOLTIP_PBCF_PAGE";
-	
-  private Text uriText_;
-  /* CONTEXT_ID PBCF0002 for the URI field of the Bean Config Page */
-  private final String INFOPOP_PBCF_TEXT_URI = "PBCF0002"; //$NON-NLS-1$
-  private final String TOOLTIP_PBCF_TEXT_URI = "TOOLTIP_PBCF_TEXT_URI";
-	
-  private Text wsdlFolderText_;
-  /* CONTEXT_ID PBCF0006 for the WSDL Folder field in the Bean Config Page */
-  private final String INFOPOP_PBCF_TEXT_WSDL_FOLDER = "PBCF0006"; //$NON-NLS-1$
-  private final String TOOLTIP_PBCF_TEXT_WSDL_FOLDER = "TOOLTIP_PBCF_TEXT_WSDL_FOLDER";
-	
-  private Text wsdlFileText_;
-  /* CONTEXT_ID PBCF0007 for the WSDL File field of the Bean Config Page */
-  private final String INFOPOP_PBCF_TEXT_WSDL_FILE = "PBCF0007"; //$NON-NLS-1$
-  private final String TOOLTIP_PBCF_TEXT_WSDL_FILE = "TOOLTIP_PBCF_TEXT_WSDL_FILE";
-	
-  private Tree methodsTree_;
-  /* CONTEXT_ID PBME0002 for the Methods tree of the Bean Methods Page */
-  private final String INFOPOP_PBME_TREE_METHODS = "PBME0002"; //$NON-NLS-1$
-  private final String TOOLTIP_PBME_TREE_METHODS = "TOOLTIP_PBME_TREE_METHODS";
-	
-  private Button selectAllMethodsButton_;
-  /* CONTEXT_ID PBME0010 for the Select All button of the Bean Methods Page */
-  private final String INFOPOP_PBME_BUTTON_SELECT_ALL = "PBME0010"; //$NON-NLS-1$
-  private final String TOOLTIP_PBME_BUTTON_SELECT_ALL = "TOOLTIP_PBME_BUTTON_SELECT_ALL";
-	
-  private Button deselectAllMethodsButton_;
-  /* CONTEXT_ID PBME0011 for the Deselect All button of the Bean Methods Page */
-  private final String INFOPOP_PBME_BUTTON_DESELECT_ALL = "PBME0011"; //$NON-NLS-1$
-  private final String TOOLTIP_PBME_BUTTON_DESELECT_ALL = "TOOLTIP_PBME_BUTTON_DESELECT_ALL";
-	
-  private Button showMappingsCheckbox_;
-  /* CONTEXT_ID PBCF0016 for the Show Mappings checkbox of the Bean Methods Page */   
-  private String INFOPOP_P2N_SHOW_MAPPINGS = "PBCF0016"; //$NON-NLS-1$
-
-  public WidgetDataEvents addControls( Composite parent, Listener statusListener )
-  {
-    String       baseConPluginId = "org.eclipse.jst.ws.consumption.ui";
-    MessageUtils msgUtils     = new MessageUtils( pluginId_ + ".plugin", this );
-    MessageUtils baseConUtils = new MessageUtils( baseConPluginId + ".plugin", this );
-    UIUtils      uiUtils        = new UIUtils(msgUtils, pluginId_ );
-    UIUtils      baseConUiUtils = new UIUtils( baseConUtils, pluginId_ );
-    
-    statusListener_ = statusListener;    
-	parent.setToolTipText( msgUtils.getMessage( TOOLTIP_PBCF_PAGE ) );
-	PlatformUI.getWorkbench().getHelpSystem().setHelp( parent, pluginId_ + "." + INFOPOP_PBCF_PAGE );
-    
-    Composite configGroup = uiUtils.createComposite( parent, 2 );
-    
-    uriText_ = uiUtils.createText( configGroup, "LABEL_URI",
-                                   TOOLTIP_PBCF_TEXT_URI,
-                                   INFOPOP_PBCF_TEXT_URI,
-                                   SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
-    
-    wsdlFolderText_ = uiUtils.createText( configGroup, "LABEL_OUTPUT_FOLDER_NAME",
-                                          TOOLTIP_PBCF_TEXT_WSDL_FOLDER,
-                                          INFOPOP_PBCF_TEXT_WSDL_FOLDER,
-                                          SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
-    
-    wsdlFileText_ = uiUtils.createText( configGroup, "LABEL_OUTPUT_FILE_NAME",
-                                        TOOLTIP_PBCF_TEXT_WSDL_FILE,
-                                        INFOPOP_PBCF_TEXT_WSDL_FILE,
-                                        SWT.SINGLE | SWT.BORDER  );
-    wsdlFileText_.addListener( SWT.Modify, statusListener );
-    
-    Label separator = uiUtils.createHorizontalSeparator( parent, 6 );
-    
-    // TODO this group has no TOOLTIP or INFOPOP.
-    Group    methodsGroup = baseConUiUtils.createGroup( parent, "LABEL_METHODS", null, null );
-	methodsGroup.setLayoutData( uiUtils.createFillAll() );
-	
-	GridLayout layout = new GridLayout();
-	layout.marginHeight = 0;
-	layout.marginWidth = 0;
-	methodsGroup.setLayout( layout );
-	
-	methodsTree_ = uiUtils.createTree( methodsGroup, TOOLTIP_PBME_TREE_METHODS, 
-	                                   INFOPOP_PBME_TREE_METHODS,
-	                   				   SWT.MULTI | SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL	| SWT.CHECK );
-	methodsTree_.addListener( SWT.Selection, statusListener );
-
-    Composite selectButtons = uiUtils.createComposite( methodsGroup, 2 );
-    
-    selectAllMethodsButton_ 
-      = baseConUiUtils.createPushButton( selectButtons, "BUTTON_SELECT_ALL", 
-                                  TOOLTIP_PBME_BUTTON_SELECT_ALL,
-                                  INFOPOP_PBME_BUTTON_SELECT_ALL );
-    selectAllMethodsButton_.addSelectionListener( new SelectionAdapter() 
-                                                  {
-                                                    public void widgetSelected( SelectionEvent evt )
-                                                    {
-                                                      handleSelectAll( true );
-                                                    }
-                                                  });
-    
-    deselectAllMethodsButton_ 
-      = baseConUiUtils.createPushButton( selectButtons, "BUTTON_DESELECT_ALL", 
-                                  TOOLTIP_PBME_BUTTON_DESELECT_ALL,
-                                  INFOPOP_PBME_BUTTON_DESELECT_ALL );
-    deselectAllMethodsButton_.addSelectionListener( new SelectionAdapter() 
-                                                    {
-                                                      public void widgetSelected( SelectionEvent evt )
-                                                      {
-                                                        handleSelectAll( false );
-                                                      }
-                                                    });
-    
-    // TODO this group has no TOOLTIP or INFOPOP.
-    Group styleGroup = uiUtils.createGroup( parent, "LABEL_STYLE_USE", null, null );
-    
-    // TODO radio buttons have no TOOLTIP or INFOPOP.
-    docLiteralButton_ = uiUtils.createRadioButton( styleGroup, "STYLE_DOC_LITERAL", null, null );
-    rpcLiteralButton_ = uiUtils.createRadioButton( styleGroup, "STYLE_RPC_LITERAL", null, null );
-    rpcEncodedButton_ = uiUtils.createRadioButton( styleGroup, "STYLE_RPC_ENCODED", null, null );
-    
-    showMappingsCheckbox_ = uiUtils.createCheckbox( parent, "LABEL_EXPLORE_MAPPINGS_BEAN2XML",
-                                                    "TOOLTIP_P2N_SHOW_MAPPINGS",
-                                                    INFOPOP_P2N_SHOW_MAPPINGS );
-                                            
-    return this;
-  }
-  
-  public void handleSelectAll( boolean value )
-  {
-	TreeItem[] items = methodsTree_.getItems();
-	
-	for( int i = 0; i < items.length; i++ ) 
-	{
-	  items[i].setChecked(value);
-	}
-	
-	statusListener_.handleEvent( null );
-  }
-  
-  public void setCustomizeServiceMappings( boolean value )
-  {
-    showMappingsCheckbox_.setSelection( value );
-  }
-  
-  public boolean getCustomizeServiceMappings()
-  {
-    return showMappingsCheckbox_ == null ? false : showMappingsCheckbox_.getSelection();
-  }
-  
-  public void setJavaParameter( JavaWSDLParameter javaParameter )
-  {
-    javaParameter_ = javaParameter;
-    
-	String wsdlLocation = javaParameter.getOutputWsdlLocation();
-
-	// TODO Verify that we need to find the WSDL in the eclipse file system.
-	//IFile file 
-	//  = ResourceUtils.getWorkspaceRoot().getFileForLocation(new Path(wsdlLocation));
-	//IPath wsdlPath = file.getFullPath();
-	IPath wsdlPath = new Path( wsdlLocation );
-	
-	wsdlFolderText_.setText(wsdlPath.removeLastSegments(1).toString());
-	wsdlFileText_.setText(wsdlPath.lastSegment());
-	
-	String location = javaParameter.getUrlLocation();
-	uriText_.setText(location == null ? "" : location);  
-	
-	methodsTree_.removeAll();
-	Hashtable methods = javaParameter.getMethods();
-	Enumeration e = methods.keys();
-	
-	while( e.hasMoreElements() )
-	{
-	  String   name = (String) e.nextElement();
-      TreeItem item = new TreeItem(methodsTree_, SWT.NULL);
-      
-   	  item.setData(name);
-      item.setText(name);
-      item.setChecked((((Boolean) methods.get(name)).booleanValue()));
-	}
-	
-	TreeItem[] items = methodsTree_.getItems();
-	
-	if( items.length > 0 ) 
-	{
-	  methodsTree_.setSelection( new TreeItem[]{ items[0] } );
-	}
-	
-	String style = javaParameter.getStyle();
-	
-	if( style.equals( JavaWSDLParameter.STYLE_RPC ) )
-	{
-	  rpcEncodedButton_.setSelection(true);
-	}
-	else if( style.equals( JavaWSDLParameter.STYLE_DOCUMENT ) )
-	{
-	  rpcLiteralButton_.setSelection(true);	  
-	}
-	else
-	{
-	  docLiteralButton_.setSelection(true);  
-	}
-  }
-  
-  public JavaWSDLParameter getJavaParameter()
-  {
-    IPath wsdlPath 
-      = new Path( wsdlFolderText_.getText().trim() ).append( wsdlFileText_.getText().trim() );
-	IWorkspaceRoot workspace = ResourceUtils.getWorkspaceRoot();
-    
-	// TODO Do we need to go to the eclipse file system??
-	//String wsdlLocation = workspace.getFile(wsdlPath).getLocation().toString();
-	String wsdlLocation = wsdlPath.toString();
-	
-	javaParameter_.setOutputWsdlLocation(wsdlLocation);
-	javaParameter_.setInputWsdlLocation(wsdlLocation);
-	
-	String fileURL = PlatformUtils.getFileURLFromPath(new Path(wsdlLocation));
-
-	Hashtable methods = new Hashtable();
-
-	TreeItem[] items = methodsTree_.getItems();
-	
-	for( int i = 0; i < items.length; i++ ) 
-	{
-	  TreeItem item = items[i];
-	  methods.put((String)item.getData(), new Boolean(item.getChecked()));
-	}
-	
-	javaParameter_.setMethods(methods);
-	
-	if( rpcEncodedButton_.getSelection()) 
-	{
-	  javaParameter_.setStyle(JavaWSDLParameter.STYLE_RPC);
-	  javaParameter_.setUse(JavaWSDLParameter.USE_ENCODED);
-	} 
-	else if( rpcLiteralButton_.getSelection()) 
-	{
-	  javaParameter_.setStyle(JavaWSDLParameter.STYLE_DOCUMENT);
-	  javaParameter_.setUse(JavaWSDLParameter.USE_LITERAL);
-	} 
-	else 
-	{
-	  javaParameter_.setStyle(JavaWSDLParameter.STYLE_WRAPPED);
-	  javaParameter_.setUse(JavaWSDLParameter.USE_LITERAL);
-	}
-    
-	return javaParameter_;
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.WidgetContributor#getStatus()
-   */
-  public Status getStatus() 
-  {
-    Status       result   = null;
-    MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
-    
-    if( wsdlFileText_.getText().equals( "" ) )
-    {
-      result = new SimpleStatus( "", msgUtils.getMessage( "PAGE_MSG_NO_FILE_SPECIFIED" ), Status.ERROR ); 
-    }
-    else
-    {
-      TreeItem[] items        = methodsTree_.getItems();
-      boolean    itemSelected = false;
-      
-      for( int index = 0; index < items.length; index++ )
-      {
-        if( items[index].getChecked() )
-        {
-          itemSelected = true;
-          break;
-        }
-      }
-      
-      if( !itemSelected )
-      {
-        result = new SimpleStatus( "", msgUtils.getMessage( "PAGE_MSG_NO_METHOD_SELECTED" ), Status.ERROR ); 
-      }
-    }
-    
-    return result;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/DefaultsForConfig.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/DefaultsForConfig.java
deleted file mode 100644
index db676aa..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/DefaultsForConfig.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.jst.ws.internal.axis.creation.ui.widgets.bean;
-
-import java.util.Hashtable;
-
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-
-
-public class DefaultsForConfig extends SimpleCommand
-{
-  public JavaWSDLParameter getJavaParameter()
-  {
-    JavaWSDLParameter parameter = new JavaWSDLParameter();
-    Hashtable         methods   = new Hashtable();
-    
-    methods.put( "method1", new Boolean( true ) );
-    methods.put( "method2", new Boolean( false ) );
-    methods.put( "method3", new Boolean( true ) );
-    
-    parameter.setMethods( methods );
-    parameter.setOutputWsdlLocation( "/SomeProj/SomeFolder/SomeFile" );
-    parameter.setUrlLocation( "SomeURLLocation" );
-    parameter.setStyle( JavaWSDLParameter.STYLE_DOCUMENT );
-      
-    return parameter;
-  }
-  
-  public boolean getCustomizeServiceMappings()
-  {
-    return true;
-  }      
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/ValidateObjectSelectionCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/ValidateObjectSelectionCommand.java
deleted file mode 100644
index 8c88ee3..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/ValidateObjectSelectionCommand.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.axis.creation.ui.widgets.bean;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jem.internal.plugin.JavaEMFNature;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.impl.JavaClassImpl;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.common.StringToIProjectTransformer;
-import org.eclipse.jst.ws.internal.consumption.common.JavaResourceFilter;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-
-
-public class ValidateObjectSelectionCommand extends SimpleCommand
-{
-  private String JAVA_EXTENSION = ".java"; //$NON-NLS-1$
-  private String CLASS_EXTENSION = ".class"; //$NON-NLS-1$
-  private MessageUtils msgUtils_;
-  private IStructuredSelection objectSelection;
-  private String serviceProjectName;
-
-  
-  /**
-   * Validates that the selected Java bean can be loaded from the service project. If it can't, an error is displayed.
-   */
-  public ValidateObjectSelectionCommand()
-  {
-    super();
-    String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
-    msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-  }
-  public Status execute(Environment env)
-  {
-    //Make sure a bean is selected
-    String javaBeanName = null;
-    if (objectSelection != null && !objectSelection.isEmpty())
-    {
-      Object object = objectSelection.getFirstElement();
-      if (object instanceof String)
-      {
-        javaBeanName = ((String)object);
-      }
-      else
-      {
-      	//The ObjectSelectionWidget never appeared and so the IStucturedSelection from 
-      	//ObjectSelectionWidgetOutputCommand is the initial selection. 
-      	//Get the Java bean name from the selection.
-      	try
-		{
-      	  System.out.println(object.getClass().toString());
-      	  javaBeanName = getJavaBeanFromObjectSelection(objectSelection);
-		} catch (CoreException ce)
-		{
-		  Status errorStatus = new SimpleStatus("",msgUtils_.getMessage("MSG_ERROR_CANNOT_NO_JAVA_BEAN"),Status.ERROR);
-		  env.getStatusHandler().reportError(errorStatus);
-		  return errorStatus;			
-		}
-      }
-    }    
-    
-    if (javaBeanName==null || javaBeanName.length()==0)
-    {
-      Status errorStatus = new SimpleStatus("",msgUtils_.getMessage("MSG_ERROR_CANNOT_NO_JAVA_BEAN"),Status.ERROR);
-      env.getStatusHandler().reportError(errorStatus);
-      return errorStatus;
-    }
-    
-    //Make sure a project is selected
-    IProject serviceProject = (IProject)((new StringToIProjectTransformer()).transform(serviceProjectName));
-    if (serviceProject==null)
-    {
-      Status errorStatus = new SimpleStatus("",msgUtils_.getMessage("MSG_ERROR_NO_PROJECT"),Status.ERROR);
-      env.getStatusHandler().reportError(errorStatus);
-      return errorStatus;      
-    }
-    
-    //Make sure the selected bean can be loaded from the selected project
-	if (javaBeanName.toLowerCase().endsWith(JAVA_EXTENSION)
-		|| javaBeanName.toLowerCase().endsWith(CLASS_EXTENSION)) {
-		javaBeanName = javaBeanName.substring(0, javaBeanName.lastIndexOf('.'));
-	}
-	
-    try
-    {
-	  JavaEMFNature jMOF = (JavaEMFNature) JavaEMFNature.createRuntime(serviceProject);
-	  JavaClass javaClass =(JavaClass) JavaClassImpl.reflect(javaBeanName, jMOF.getResourceSet());
-	  if (!javaClass.isExistingType()) 
-	  {		
-		Status errorStatus = new SimpleStatus("JavaToWSDLMethodCommand", msgUtils_.getMessage("MSG_ERROR_CANNOT_LOAD_JAVA_BEAN", new String[] { javaBeanName, serviceProjectName }),Status.ERROR);
-		env.getStatusHandler().reportError(errorStatus);
-		return errorStatus;
-	  }
-    } catch (CoreException ce)
-    {
-	  Status errorStatus = new SimpleStatus("JavaToWSDLMethodCommand", msgUtils_.getMessage("MSG_ERROR_CANNOT_LOAD_JAVA_BEAN", new String[] { javaBeanName, serviceProjectName }),Status.ERROR);
-	  env.getStatusHandler().reportError(errorStatus);
-      return errorStatus;      
-    }
-    
-    return new SimpleStatus("");
-  }
-  
-  /**
-   * @param serviceProjectName The serviceProjectName to set.
-   */
-  public void setServiceProjectName(String serviceProjectName)
-  {
-    this.serviceProjectName = serviceProjectName;
-  }
-  
-  /**
-   * @param objectSelection The objectSelection to set.
-   */
-  public void setObjectSelection(IStructuredSelection objectSelection)
-  {
-    this.objectSelection = objectSelection;
-  }
-
-  private String getJavaBeanFromObjectSelection(IStructuredSelection objectSelection) throws CoreException
-  {
-    String beanClass = "";
-    JavaResourceFilter filter = new JavaResourceFilter(); 
-    //IStructuredSelection selection = initialSelection_;
-    //
-    if (objectSelection != null)
-    {
-      Object obj = objectSelection.getFirstElement();
-      if (obj != null)
-      {
-        // get the IResource represented by the selection
-        IResource res = null;
-        
-        res = ResourceUtils.getResourceFromSelection(obj);
-        
-        if (filter.accepts(res))
-        {
-          // get the package-qualified class name without file extensions
-          String beanPackage = ResourceUtils.getJavaResourcePackageName(res.getFullPath());
-          if (beanPackage==null)
-            beanPackage = "";
-          else
-            beanPackage = beanPackage + ".";
-
-          beanClass = beanPackage + res.getName();
-
-          if (beanClass.toLowerCase().endsWith(".java") || beanClass.toLowerCase().endsWith(".class")) {
-            beanClass = beanClass.substring(0,beanClass.lastIndexOf('.'));
-          }
-        }
-      }
-    }
-    
-    //
-    return beanClass;
-  }    
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/AxisSkeletonDefaultingCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/AxisSkeletonDefaultingCommand.java
deleted file mode 100644
index 2101f67..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/AxisSkeletonDefaultingCommand.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.jst.ws.internal.axis.creation.ui.widgets.skeleton;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.consumption.common.WSDLParserFactory;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.ws.parser.discovery.WebServicesParserExt;
-import org.eclipse.wst.ws.parser.wsil.WebServicesParser;
-
-
-public class AxisSkeletonDefaultingCommand extends SimpleCommand
-{
-  private IStructuredSelection initialSelection;
-  private IStructuredSelection objectSelection;
-  private WebServicesParser webServicesParser;
-  private String wsdlURI_;
-
-  public void setInitialSelection(IStructuredSelection initialSelection)
-  {
-    this.initialSelection = initialSelection;
-  }
-
-  public void setObjectSelection(IStructuredSelection objectSelection)
-  {
-    this.objectSelection = objectSelection;
-  }
-  
-  public void setWebServicesParser(WebServicesParser webServicesParser)
-  {
-    this.webServicesParser = webServicesParser;
-  }
-  
-  public WebServicesParser getWebServicesParser()
-  {
-    if (webServicesParser == null)
-		webServicesParser = WSDLParserFactory.getWSDLParser();
-    return webServicesParser;
-  }
-
-  public String getWebServiceURI()
-  {
-    if (initialSelection != null && !initialSelection.isEmpty())
-    {
-      Object firstElement = initialSelection.getFirstElement();
-      if (firstElement instanceof IFile)
-      {
-        IFile ifile = (IFile)firstElement;
-        String fileExtension = ifile.getFileExtension();
-        if (fileExtension.equals("wsdl") ||
-            fileExtension.equals("wsil") ||
-            fileExtension.equals("html"))
-        {
-          return ifile.getFullPath().toString();  
-        }
-      }
-    }
-    return "";
-  }
-  
-  public String getWsdlURI()
-  {
-//    if (objectSelection != null && !objectSelection.isEmpty())
-//    {
-//      Object object = objectSelection.getFirstElement();
-//      if (object instanceof IResource)
-//        return ((IResource)object).getLocation().toString();
-//      else
-//        return object.toString();
-//    }
-//    return "";
-	  return wsdlURI_;
-  }
-  
-  public void setWsdlURI(String wsdlURI)
-  {
-	  wsdlURI_ = wsdlURI;
-	  
-  }
-  
-  public boolean getGenWSIL()
-  {
-    return false;
-  }
-  
-  public String getWsilURI()
-  {
-    String wsURI = getWsdlURI();
-    int index = wsURI.lastIndexOf('.');
-    if (index != -1)
-    {
-      StringBuffer sb = new StringBuffer(wsURI.substring(0, index));
-      sb.append(".wsil");
-      return sb.toString();
-    }
-    return "";
-  }
-  
-  public JavaWSDLParameter getJavaWSDLParam()
-  {
-    JavaWSDLParameter javaWSDLParam = new JavaWSDLParameter();
-    javaWSDLParam.setServerSide(JavaWSDLParameter.SERVER_SIDE_BEAN);
-    javaWSDLParam.setSkeletonDeploy(true);
-    javaWSDLParam.setMetaInfOnly(false);
-    return javaWSDLParam;
-  }
-
-  public String getHttpBasicAuthPassword()
-  {
-    return getWebServicesParser().getHTTPBasicAuthPassword();
-  }
-
-  public String getHttpBasicAuthUsername()
-  {
-    return getWebServicesParser().getHTTPBasicAuthUsername();
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/AxisSkeletonFragment.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/AxisSkeletonFragment.java
deleted file mode 100644
index 29a4b19..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/AxisSkeletonFragment.java
+++ /dev/null
@@ -1,138 +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.axis.creation.ui.widgets.skeleton;
-
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.AxisDeployCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.WSDL2JavaCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.AddJarsToProjectBuildPathTask;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.CheckAxisDeploymentDescriptorsTask;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.CopyAxisJarCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.RefreshProjectCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.ValidateWSDLCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.widgets.AxisMappingsFragment;
-import org.eclipse.jst.ws.internal.axis.creation.ui.command.ComputeAxisSkeletonBeanCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.command.UpdateWEBXMLCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.MoveDeploymentFilesTask;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.Skeleton2WSDLCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.BuildProjectCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.StartProjectCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.command.OpenJavaEditorCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.command.data.ProjectName2IProjectTransformer;
-import org.eclipse.jst.ws.internal.consumption.ui.command.data.ServerName2IServerTransformer;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionOutputCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ObjectSelectionOutputCommand;
-import org.eclipse.wst.command.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.env.ui.widgets.SelectionCommand;
-
-public class AxisSkeletonFragment extends SequenceFragment
-{
-  public AxisSkeletonFragment()
-  {
-    add( new SimpleFragment( new AxisSkeletonDefaultingCommand(), "" ) );
-    add( new SimpleFragment( new ValidateWSDLCommand(), ""));
-    add( new SimpleFragment( new SkeletonConfigWidgetDefaultingCommand(), ""));
-    add( new SimpleFragment( "SkeletonConfig") );
-    add( new AxisMappingsFragment() );
-    add( new SimpleFragment( new CheckAxisDeploymentDescriptorsTask(), ""));
-    add( new SimpleFragment( new AddJarsToProjectBuildPathTask(), ""));
-    add( new SimpleFragment( new CopyAxisJarCommand(), ""));
-    add( new SimpleFragment( new WSDL2JavaCommand(), ""));
-    add( new SimpleFragment( new MoveDeploymentFilesTask(), ""));
-    add( new SimpleFragment( new Skeleton2WSDLCommand(), ""));
-    add( new SimpleFragment( new UpdateWEBXMLCommand(), ""));
-    add( new SimpleFragment( new RefreshProjectCommand(), ""));
-    add( new SimpleFragment( new BuildProjectCommand(), ""));
-    add( new SimpleFragment( new StartProjectCommand(), ""));
-    // the second build project command is needed to synchronize with workspace auto build
-    add( new SimpleFragment( new BuildProjectCommand(), ""));
-    add( new SimpleFragment( new AxisDeployCommand(), ""));
-    add( new SimpleFragment( new RefreshProjectCommand(), ""));
-    add (new SimpleFragment( new ComputeAxisSkeletonBeanCommand(), ""));
-    add( new SimpleFragment( new OpenJavaEditorCommand(), ""));
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.core.fragment.CommandFragment#registerDataMappings(org.eclipse.wst.command.env.core.data.DataMappingRegistry)
-   */
-  public void registerDataMappings(DataMappingRegistry dataRegistry)
-  {
-    // Transformers
-    ProjectName2IProjectTransformer projectTransformer = new ProjectName2IProjectTransformer();
-
-    dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", AxisSkeletonDefaultingCommand.class);
-    dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "ObjectSelection", AxisSkeletonDefaultingCommand.class);
-    dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "WebServicesParser", AxisSkeletonDefaultingCommand.class);
-    
-    // ValidateWSDLCommand
-    dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "WebServicesParser", ValidateWSDLCommand.class);
-    dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "WsdlURI", ValidateWSDLCommand.class);
-    
-    // SkeletonConfigWidgetDefaultingCommand
-    dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", SkeletonConfigWidgetDefaultingCommand.class);
-    dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "WsdlURI", SkeletonConfigWidgetDefaultingCommand.class);
-    
-    // CheckAxisDeploymentDescriptorsTask
-    dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", CheckAxisDeploymentDescriptorsTask.class, "ServerProject", projectTransformer);
-
-    // AddJarsToProjectBuildPathTask
-    dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", AddJarsToProjectBuildPathTask.class, "Project", projectTransformer);
-    
-    dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "WsdlURI", WSDL2JavaCommand.class);
-    //dataRegistry.addMapping(WSDLSelectionTreeWidget.class, "WsdlURI", WSDL2JavaCommand.class);
-    dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "HttpBasicAuthUsername", WSDL2JavaCommand.class);
-    dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "HttpBasicAuthPassword", WSDL2JavaCommand.class);
-
-    // MoveDeploymentFilesTask
-    dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", MoveDeploymentFilesTask.class, "ServerProject", projectTransformer);
-    dataRegistry.addMapping(WSDL2JavaCommand.class, "JavaWSDLParam", MoveDeploymentFilesTask.class);
-
-    // CopyAxisJarCommand
-    dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", CopyAxisJarCommand.class, "Project", projectTransformer);
-
-    // Skeleton2WSDLCommand
-    dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "WebServicesParser", Skeleton2WSDLCommand.class);
-    dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", Skeleton2WSDLCommand.class, "ServerProject", projectTransformer);
-    dataRegistry.addMapping(WSDL2JavaCommand.class, "JavaWSDLParam", Skeleton2WSDLCommand.class);
-
-    // UpdateWEBXMLCommand
-    dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", UpdateWEBXMLCommand.class, "ServerProject", projectTransformer);
-
-    // RefreshProjectCommand
-    dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", RefreshProjectCommand.class, "Project", projectTransformer);
-    
-    // BuildProjectCommand
-    dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", BuildProjectCommand.class, "Project", projectTransformer);
-
-    // StartProjectCommand
-    dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", StartProjectCommand.class, "ServiceProject", projectTransformer);
-    dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerServer", StartProjectCommand.class, "ServiceExistingServer", new ServerName2IServerTransformer());
-    dataRegistry.addMapping(CopyAxisJarCommand.class, "ProjectRestartRequired", StartProjectCommand.class, "IsWebProjectStartupRequested", null);
-
-    // AxisDeployCommand
-    dataRegistry.addMapping(WSDL2JavaCommand.class, "JavaWSDLParam", AxisDeployCommand.class);
-    
-    // ServerExtensionOutputCommand
-    dataRegistry.addMapping(Skeleton2WSDLCommand.class, "WsdlURI", ServerExtensionOutputCommand.class);
-    dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "WebServicesParser", ServerExtensionOutputCommand.class);
-    
-    // ComputeAxisSkeletonBeanCommand
-    dataRegistry.addMapping(WSDL2JavaCommand.class, "JavaWSDLParam", ComputeAxisSkeletonBeanCommand.class);
-    //dataRegistry.addMapping(Skeleton2WSDLCommand.class, "WsdlURI", ComputeAxisSkeletonBeanCommand.class);
-    //dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "WebServicesParser", ComputeAxisSkeletonBeanCommand.class);
-    
-    // OpenJavaEditorCommand
-    dataRegistry.addMapping(ComputeAxisSkeletonBeanCommand.class, "ClassNames", OpenJavaEditorCommand.class);
-    dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", OpenJavaEditorCommand.class, "Project", projectTransformer);
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/SkeletonConfigWidget.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/SkeletonConfigWidget.java
deleted file mode 100644
index 1ce0f7d..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/SkeletonConfigWidget.java
+++ /dev/null
@@ -1,215 +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.axis.creation.ui.widgets.skeleton;
-
-import java.io.File;
-import java.net.MalformedURLException;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.env.ui.widgets.WidgetDataEvents;
-
-
-public class SkeletonConfigWidget extends SimpleWidgetDataContributor
-{
-  private JavaWSDLParameter javaWSDLParam;
-
-  /* CONTEXT_ID PBSC0001 for the Skeleton Config Page */
-  private static final String INFOPOP_PBSC_PAGE = "PBSC0001"; //$NON-NLS-1$
-  private static final String TOOLTIP_PBSC_PAGE = "TOOLTIP_PBSC_PAGE";
-  
-  // private Text uriText_;
-  /* CONTEXT_ID PBCF0002 for the URI field of the Bean Config Page */
-  private final String INFOPOP_PBCF_TEXT_URI = "PBCF0002"; //$NON-NLS-1$
-  private final String TOOLTIP_PBCF_TEXT_URI = "TOOLTIP_PBCF_TEXT_URI";
-  
-  private Text wsdlFolderText_;
-  /* CONTEXT_ID PBCF0006 for the WSDL Folder field in the Bean Config Page */
-  private final String INFOPOP_PBCF_TEXT_WSDL_FOLDER = "PBCF0006"; //$NON-NLS-1$
-  private final String TOOLTIP_PBCF_TEXT_WSDL_FOLDER = "TOOLTIP_PBCF_TEXT_WSDL_FOLDER";
-  
-  private Text wsdlFileText_;
-  /* CONTEXT_ID PBCF0007 for the WSDL File field of the Bean Config Page */
-  private final String INFOPOP_PBCF_TEXT_WSDL_FILE = "PBCF0007"; //$NON-NLS-1$
-  private final String TOOLTIP_PBCF_TEXT_WSDL_FILE = "TOOLTIP_PBCF_TEXT_WSDL_FILE";
-  
-  private Combo skeletonFolderText_;
-  /* CONTEXT_ID PBSC0004 for the Skeleton Folder field of the Skeleton Config Page */
-  private static final String INFOPOP_PBSC_TEXT_SKELETON_FOLDER = "PBSC0004"; //$NON-NLS-1$
-  private static final String TOOLTIP_PBSC_TEXT_SKELETON_FOLDER = "TOOLTIP_PBSC_TEXT_SKELETON_FOLDER";
-  //
-
-  /* CONTEXT_ID PBSC0005 for the Skeleton Folder Browse button of the Skeleton Config Page */
-  // private static final String INFOPOP_PBSC_BUTTON_SKELETON_FOLDER_BROWSE = "PBSC0005"; //$NON-NLS-1$
-  // private static final String TOOLTIP_PBSC_BUTTON_SKELETON_FOLDER_BROWSE = "TOOLTIP_PBSC_BUTTON_SKELETON_FOLDER_BROWSE";
-  
-  private Button showMappingsCheckbox_;
-  /* CONTEXT_ID PBSC0016 for the Show Mappings checkbox of the Bean Methods Page  */
-  private String INFOPOP_N2P_SHOW_MAPPINGS = "PBSC0016"; //$NON-NLS-1$
-	
-  public WidgetDataEvents addControls( Composite parent, Listener statusListener)
-  {
-    String       pluginId        = "org.eclipse.jst.ws.axis.creation.ui";
-    String       conPluginId     = "org.eclipse.jst.ws.axis.consumption.ui";
-    String       baseConPluginId = "org.eclipse.jst.ws.consumption.ui";
-    
-    MessageUtils msgUtils        = new MessageUtils( pluginId + ".plugin", this );
-    MessageUtils conMsgUtils     = new MessageUtils( conPluginId + ".plugin", this );
-    MessageUtils baseConMsgUtils = new MessageUtils( baseConPluginId + ".plugin", this );
-    UIUtils      uiUtils         = new UIUtils( msgUtils, pluginId );
-    UIUtils      conUiUtils      = new UIUtils( conMsgUtils, pluginId );
-    UIUtils      baseConUiUtils  = new UIUtils( baseConMsgUtils, pluginId );
-
-  	PlatformUI.getWorkbench().getHelpSystem().setHelp( parent, pluginId + "." +  INFOPOP_PBSC_PAGE );
-  	parent.setToolTipText( msgUtils.getMessage( TOOLTIP_PBSC_PAGE ) );
-    
-    Composite textGroup = uiUtils.createComposite( parent, 2, 0, 0 );
-
-    /*
-    uriText_ = uiUtils.createText( textGroup, "LABEL_URI",
-                                   TOOLTIP_PBCF_TEXT_URI,
-                                   INFOPOP_PBCF_TEXT_URI,
-                                   SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
-    */
-
-    wsdlFolderText_ = uiUtils.createText( textGroup, "LABEL_OUTPUT_FOLDER_NAME",
-                                          TOOLTIP_PBCF_TEXT_WSDL_FOLDER,
-                                          INFOPOP_PBCF_TEXT_WSDL_FOLDER,
-                                          SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
-
-    wsdlFileText_ = uiUtils.createText( textGroup, "LABEL_OUTPUT_FILE_NAME",
-                                        TOOLTIP_PBCF_TEXT_WSDL_FILE,
-                                        INFOPOP_PBCF_TEXT_WSDL_FILE,
-                                        SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
-
-    skeletonFolderText_ = baseConUiUtils.createCombo( textGroup, "LABEL_SKELETON_ROOT_NAME",
-        TOOLTIP_PBSC_TEXT_SKELETON_FOLDER,
-        INFOPOP_PBSC_TEXT_SKELETON_FOLDER,
-        SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
-
-    Label separator = uiUtils.createHorizontalSeparator( parent, 5 );
-
-    showMappingsCheckbox_ = conUiUtils.createCheckbox( parent, "LABEL_EXPLORE_MAPPINGS_XML2BEAN",
-                                                       "TOOLTIP_N2P_SHOW_MAPPINGS",
-                                                       INFOPOP_N2P_SHOW_MAPPINGS );
-        
-    return this;
-  }
-  
-  public void setEndpointURI(String endpointURI)
-  {
-  	/*
-    if (endpointURI != null)
-      uriText_.setText(endpointURI);
-    */
-  }
-  
-  public void setOutputWSDLFolder(String outputWSDLFolder)
-  {
-    if (outputWSDLFolder != null)
-      wsdlFolderText_.setText(outputWSDLFolder);
-  }
-  
-  public void setOutputWSDLFile(String outputWSDLFile)
-  {
-    if (outputWSDLFile != null)
-      wsdlFileText_.setText(outputWSDLFile);
-  }
-  
-  public void setOutputJavaFolder(String outputJavaFolder)
-  {
-    if (outputJavaFolder != null)
-    {
-      int index = skeletonFolderText_.indexOf(outputJavaFolder);
-      if (index != -1)
-        skeletonFolderText_.select(index);
-      else if (skeletonFolderText_.getItemCount() <= 0)
-      {
-        String root = getWorkspaceRootLocation();
-        if (outputJavaFolder.startsWith(root))
-          skeletonFolderText_.setText(outputJavaFolder.substring(root.length()));
-        else
-          skeletonFolderText_.setText(outputJavaFolder);
-      }
-    }
-  }
-  
-  public void setShowMapping(boolean showMapping)
-  {
-    showMappingsCheckbox_.setSelection(showMapping);
-  }
-  
-  public boolean getShowMapping()
-  {
-    return showMappingsCheckbox_.getSelection();
-  }
-
-  /**
-   * @return Returns the javaWSDLParam.
-   */
-  public JavaWSDLParameter getJavaWSDLParam() {
-    String root = getWorkspaceRootLocation();
-    File file = new File(root);
-    try
-    {
-      root = file.toURL().toString();
-      char lastChar = root.charAt(root.length()-1);
-      if (lastChar == '/' || lastChar == '\\')
-        root = root.substring(0, root.length()-1);
-    }
-    catch (MalformedURLException murle)
-    {
-    }
-    javaWSDLParam.setOutput(root + wsdlFolderText_.getText());
-    javaWSDLParam.setJavaOutput(root + skeletonFolderText_.getText());
-	  return javaWSDLParam;
-  }
-
-  /**
-   * @param javaWSDLParam The javaWSDLParam to set.
-   */
-  public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam) {
-	  this.javaWSDLParam = javaWSDLParam;
-  }
-  
-  public void setServerProject(IProject serviceProject)
-  {
-    String originalSkeletonFolder = skeletonFolderText_.getText();
-    skeletonFolderText_.removeAll();
-    IPath[] paths = ResourceUtils.getAllJavaSourceLocations(serviceProject);
-    for (int i = 0; i < paths.length ; i++)
-      skeletonFolderText_.add(paths[i].toString());
-    int index = skeletonFolderText_.indexOf(originalSkeletonFolder);
-    if (index != -1)
-      skeletonFolderText_.select(index);
-    else
-      skeletonFolderText_.select(0);
-  }
-  
-  private String getWorkspaceRootLocation()
-  {
-  	return ResourcesPlugin.getWorkspace().getRoot().getLocation().removeTrailingSeparator().toString();
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/SkeletonConfigWidgetDefaultingCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/SkeletonConfigWidgetDefaultingCommand.java
deleted file mode 100644
index 231892f..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/SkeletonConfigWidgetDefaultingCommand.java
+++ /dev/null
@@ -1,100 +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.axis.creation.ui.widgets.skeleton;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.j2ee.internal.project.IWebNatureConstants;
-import org.eclipse.jst.j2ee.internal.web.operations.J2EEWebNatureRuntime;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-
-public class SkeletonConfigWidgetDefaultingCommand extends SimpleCommand
-{
-  private String wsdlURI;
-  private IProject serverProject;
-  private JavaWSDLParameter javaWSDLParam;
-
-  public void setWsdlURI(String wsdlURI)
-  {
-    this.wsdlURI = wsdlURI;
-  }
-  
-  public void setServerProject(String serverProject)
-  {
-    this.serverProject = ResourcesPlugin.getWorkspace().getRoot().getProject(serverProject);
-  }
-
-  public String getEndpointURI()
-  {
-    return null;
-  }
-  
-  public String getOutputWSDLFolder()
-  {
-//      J2EEWebNatureRuntime nature = (J2EEWebNatureRuntime)serverProject.getNature(IWebNatureConstants.J2EE_NATURE_ID);
-//      StringBuffer sb = new StringBuffer(nature.getModuleServerRoot().getFullPath().addTrailingSeparator().toString());
-//      sb.append("wsdl");
-	  IPath wsdlPath = J2EEUtils.getFirstWebContentPath(serverProject).append("wsdl");
-      return wsdlPath.toString();
-  }
-  
-  public String getOutputWSDLFile()
-  {
-    int index = wsdlURI.lastIndexOf('/');
-    if (index == -1)
-      index = wsdlURI.lastIndexOf('\\');
-    return wsdlURI.substring(index+1, wsdlURI.length());
-  }
-  
-  public String getOutputJavaFolder()
-  {
-    try
-    {
-      IClasspathEntry[] cp = JavaCore.create(serverProject).getRawClasspath();
-      for (int i = 0; i < cp.length; i++)
-        if (cp[i].getEntryKind() == IClasspathEntry.CPE_SOURCE)
-          return ResourcesPlugin.getWorkspace().getRoot().getLocation().removeTrailingSeparator().append(cp[i].getPath()).toString();
-    }
-    catch (JavaModelException jme)
-    {
-    }
-    return null;
-  }
-
-  public boolean getShowMapping()
-  {
-    return false;
-  }
-  
-  public boolean isShowMapping()
-  {
-    return getShowMapping();
-  }
-  
-  public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam)
-  {
-  	this.javaWSDLParam = javaWSDLParam;
-  }
-  
-  public JavaWSDLParameter getJavaWSDLParam()
-  {
-    javaWSDLParam.setOutput(getOutputWSDLFolder());
-    javaWSDLParam.setJavaOutput(getOutputJavaFolder());
-    return javaWSDLParam;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wizard/beans/WSBeanAxisType.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wizard/beans/WSBeanAxisType.java
deleted file mode 100644
index e8a99c0..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wizard/beans/WSBeanAxisType.java
+++ /dev/null
@@ -1,267 +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.axis.creation.ui.wizard.beans;
-
-
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.Java2WSDLCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.WSDL2JavaCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.AddJarsToProjectBuildPathTask;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.CheckAxisDeploymentDescriptorsTask;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.widgets.AxisMappingsWidget;
-import org.eclipse.jst.ws.internal.axis.creation.ui.command.JavaToWSDLMethodCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.plugin.WebServiceAxisCreationUIPlugin;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.DefaultsForServerJavaWSDLCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.LiteralSupportMessageTask;
-import org.eclipse.jst.ws.internal.axis.creation.ui.widgets.bean.AxisBeanFragment;
-import org.eclipse.jst.ws.internal.axis.creation.ui.widgets.bean.BeanConfigWidget;
-import org.eclipse.jst.ws.internal.consumption.common.JavaResourceFilter;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ObjectSelectionWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.wizard.WebServiceServerRuntimeType;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.env.core.fragment.CommandFragmentFactory;
-import org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.env.ui.widgets.WidgetContributorFactory;
-import org.eclipse.wst.command.env.ui.widgets.WidgetRegistry;
-
-
-/**
-* This is the class for the
-* Java Bean
-* {@link org.eclipse.jst.ws.was.creation.ui.wizard.WebServiceServerRuntimeType WebServiceServerRuntimeType}.
-*/
-public class WSBeanAxisType implements WebServiceServerRuntimeType, CommandWidgetBinding
-{	
-  private JavaResourceFilter filter_ = new JavaResourceFilter();
-  private String serverName_;
-  private String runtimeName_;
-  private boolean isWebModuleRequired_;
-
-  /**
-  * Returns a short, locale specific name of this Web Service type.
-  * @return A short, locale specific name of this Web Service type.
-  */
-  public String getName ()
-  {
-    return WebServiceAxisCreationUIPlugin.getMessage("%WS_NAME_BEANWAXIS");
-  }
-
-  /**
-  * Returns a locale specific description of this Web Service type.
-  * @return A locale specific description of this Web Service type.
-  */
-  public String getDescription ()
-  {
-    return WebServiceAxisCreationUIPlugin.getMessage("%WS_DESC_BEANWAXIS");
-  }
-
-  /**
-  * Returns a locale specific label for the Server supported by this Web Service type
-  * @return A locale specific server label from server plugins
-  */
-  public String getServerLabel()
-  {
-    return serverName_;
-  }
-
-  /**
-  * Sets the server label to the appropriate name found in the server plugins.
-  * @param server name
-  */
-  public void setServerLabel(String serverLabel)
-  {
-    serverName_ = serverLabel;
-  }
-  
-  /**
-  * Returns a locale specific label for the deployment runtime of this Web Service type
-  * @return A locale specific label for the deployment runtime
-  */
-  public String getRuntimeLabel()
-  {
-    return runtimeName_;
-  }
-
-  /**
-  * Sets the runtime label for the appropriate runtime
-  * @param server name
-  */
-  public void setRuntimeLabel(String runtimeLabel)
-  {
-    runtimeName_ = runtimeLabel;
-  }
-
-  /**
-  * Returns a label for the Web Service type associated with this WebServiceServerRuntimeType
-  * @return A label for the Web Service type
-  */
-  public String getWebServiceTypeLabel()
-  {
-    return WebServiceAxisCreationUIPlugin.getMessage("%WEBSERVICETYPE_NAME_JAVA_AXIS");
-  }
-
-  /**
-  * Returns whether or not a Web Module is required for this WebServiceServerRuntimeType
-  * @return true if requireWebModule
-  */
-  public boolean isWebModuleRequired()
-  {
-    return isWebModuleRequired_;
-  }
-
-  /**
-  * Sets the boolean value at runtime according to requireWebModule attribute from the manifest file
-  * @param requireWebModule 
-  */
-  public void setWebModuleRequired(boolean requireWebModule)
-  {
-    isWebModuleRequired_ = requireWebModule;
-  }
-
-  
-  /**
-  * Returns a string representation of this object.
-  * @return A string representation of this object.
-  */
-  public String toString ()
-  {
-    return getName();
-  }
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.ws.internal.consumption.ui.wizard.WebServiceServerRuntimeType#isEJBModuleRequired()
-	 */
-	public boolean isEJBModuleRequired() {
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.ws.internal.consumption.ui.wizard.WebServiceServerRuntimeType#setEJBModuleRequired(boolean)
-	 */
-	public void setEJBModuleRequired(boolean arg0) {
-		return;
-
-	}
-
-  /* (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.env.core.data.DataMappingRegistry)
-   */
-  public void registerDataMappings(DataMappingRegistry dataRegistry) 
-  {
-    /*
-    dataRegistry.addMapping( CurrentPageCommand.class, "CurrentPage", BeanClassWidget.class );
-    //BeanClassWidget - as target
-    dataRegistry.addMapping(BUAxisDefaultingCommand.class, "JavaBeanName", BeanClassWidget.class, "BeanClassName", null);
-    //BeanClassWidget - as source
-    dataRegistry.addMapping(BeanClassWidget.class, "BeanClassName", DefaultsForServerJavaWSDLCommand.class, "JavaBeanName", null);    //BeanConfigWidget
-    */
-    // ObjectSelectionWidget
-    dataRegistry.addMapping(ObjectSelectionWidget.class, "ObjectSelection", DefaultsForServerJavaWSDLCommand.class);
-    
-    //BeanConfigWidget - as target
-    dataRegistry.addMapping(JavaToWSDLMethodCommand.class, "JavaWSDLParam", BeanConfigWidget.class, "JavaParameter", null );
-    //BeanConfigWidget - as source
-    dataRegistry.addMapping(BeanConfigWidget.class, "JavaParameter", LiteralSupportMessageTask.class, "JavaWSDLParam", null);
-    dataRegistry.addMapping(BeanConfigWidget.class, "JavaParameter", CheckAxisDeploymentDescriptorsTask.class, "JavaWSDLParam", null);
-    dataRegistry.addMapping(BeanConfigWidget.class, "JavaParameter", AddJarsToProjectBuildPathTask.class, "JavaWSDLParam", null);
-    dataRegistry.addMapping(BeanConfigWidget.class, "JavaParameter", Java2WSDLCommand.class, "JavaWSDLParam", null);       
-    dataRegistry.addMapping(BeanConfigWidget.class, "JavaParameter", WSDL2JavaCommand.class, "JavaWSDLParam", null);
-        
-    //MappingFragment (optionally displays the AxisMappingsWidget) 
-    dataRegistry.addMapping(BeanConfigWidget.class, "CustomizeServiceMappings", AxisBeanFragment.MappingFragment.class);
-
-    //AxisMappingsWidget - as target
-    dataRegistry.addMapping(BeanConfigWidget.class, "JavaParameter", AxisMappingsWidget.class);
-    
-    //AxisMappingsWidget - as source
-    dataRegistry.addMapping(AxisMappingsWidget.class, "JavaParameter", LiteralSupportMessageTask.class, "JavaWSDLParam", null);
-    dataRegistry.addMapping(AxisMappingsWidget.class, "JavaParameter", CheckAxisDeploymentDescriptorsTask.class, "JavaWSDLParam", null);
-    dataRegistry.addMapping(AxisMappingsWidget.class, "JavaParameter", AddJarsToProjectBuildPathTask.class, "JavaWSDLParam", null);
-    dataRegistry.addMapping(AxisMappingsWidget.class, "JavaParameter", Java2WSDLCommand.class, "JavaWSDLParam", null);       
-    dataRegistry.addMapping(AxisMappingsWidget.class, "JavaParameter", WSDL2JavaCommand.class, "JavaWSDLParam", null);    
-    
-    //dataRegistry.addMapping( DefaultsForConfig.class, "JavaParameter", BeanConfigWidget.class );
-    //dataRegistry.addMapping( DefaultsForConfig.class, "CustomizeServiceMappings", BeanConfigWidget.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.axis.creation.ui";
-    MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
-    
-    /*
-    widgetRegistry.add( "BeanSelection", 
-                        msgUtils.getMessage("PAGE_TITLE_WSBEAN_CLASS"),
-                        msgUtils.getMessage("PAGE_DESC_WSBEAN_CLASS"),
-                        new WidgetContributorFactory()
-                        {
-                          public WidgetContributor create()
-                          {
-                            return new BeanClassWidget();
-                          }
-                        } );
-    */
-
-    widgetRegistry.add( "BeanConfig", 
-                        msgUtils.getMessage("PAGE_TITLE_WSBEAN_CONFIG"),
-                        msgUtils.getMessage("PAGE_DESC_WSBEAN_CONFIG"),
-                        new WidgetContributorFactory()
-                        {
-                          public WidgetContributor create()
-                          {
-                            return new BeanConfigWidget();
-                          }
-                        } );
-
-    String       consPluginId_ = "org.eclipse.jst.ws.axis.consumption.ui";
-    MessageUtils consMsgUtils = new MessageUtils( consPluginId_ + ".plugin", this );
-
-    widgetRegistry.add( "AxisServiceBeanMapping", 
-                        consMsgUtils.getMessage("PAGE_TITLE_WS_BEAN2XML"),
-                        consMsgUtils.getMessage("PAGE_DESC_P2N_MAPPINGS"),
-                        new WidgetContributorFactory()
-                        {
-                          public WidgetContributor create()
-                          {
-                            return new AxisMappingsWidget(AxisMappingsWidget.MODE_BEAN2XML );
-                          }
-                        } );
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.core.fragment.CommandFragmentFactoryFactory#create()
-   */
-  public CommandFragmentFactory create() 
-  {
-    return new CommandFragmentFactory()
-    {
-      public CommandFragment create()
-      {
-        return new AxisBeanFragment(); 
-      }
-    };
-  }
-    
-}
-
-
-
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wizard/wsdl/WSWSDLAxisType.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wizard/wsdl/WSWSDLAxisType.java
deleted file mode 100644
index 77f24cf..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wizard/wsdl/WSWSDLAxisType.java
+++ /dev/null
@@ -1,247 +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.axis.creation.ui.wizard.wsdl;
-
-
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.WSDL2JavaCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.widgets.AxisMappingsFragment;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.widgets.AxisMappingsWidget;
-import org.eclipse.jst.ws.internal.axis.creation.ui.plugin.WebServiceAxisCreationUIPlugin;
-import org.eclipse.jst.ws.internal.axis.creation.ui.widgets.skeleton.AxisSkeletonDefaultingCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.widgets.skeleton.AxisSkeletonFragment;
-import org.eclipse.jst.ws.internal.axis.creation.ui.widgets.skeleton.SkeletonConfigWidget;
-import org.eclipse.jst.ws.internal.axis.creation.ui.widgets.skeleton.SkeletonConfigWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.common.WSDLResourceFilter;
-import org.eclipse.jst.ws.internal.consumption.ui.command.data.ProjectName2IProjectTransformer;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.wizard.WebServiceServerRuntimeType;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.env.core.fragment.CommandFragmentFactory;
-import org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.env.ui.widgets.WidgetContributorFactory;
-import org.eclipse.wst.command.env.ui.widgets.WidgetRegistry;
-
-/**
-* This is the class for the Axis Web service type.
-*/
-public class WSWSDLAxisType implements WebServiceServerRuntimeType, CommandWidgetBinding 
-{
-	private WSDLResourceFilter filter_ = new WSDLResourceFilter();
-
-	private String serverName_;
-	private String runtimeName_;
-	private boolean isWebModuleRequired_;
-	/**
-	* Returns a short, locale specific name of this Web Service type.
-	* @return A short, locale specific name of this Web Service type.
-	*/
-	public String getName() {
-		return WebServiceAxisCreationUIPlugin.getMessage("%WS_NAME_WSDLAXIS");
-	}
-
-	/**
-	* Returns a locale specific description of this Web Service type.
-	* @return A locale specific description of this Web Service type.
-	*/
-	public String getDescription() {
-		return WebServiceAxisCreationUIPlugin.getMessage("%WS_DESC_WSDLAXIS");
-	}
-
-	/**
-	* Returns a locale specific label for the Server supported by this Web Service type
-	* @return A locale specific server label from server plugins
-	*/
-	public String getServerLabel() {
-		return serverName_;
-	}
-
-	/**
-	* Sets the server label to the appropriate name found in the server plugins.
-	* @param server name
-	*/
-	public void setServerLabel(String serverLabel) {
-		serverName_ = serverLabel;
-	}
-
-	/**
-	* Returns a locale specific label for the deployment runtime of this Web Service type
-	* @return A locale specific label for the deployment runtime
-	*/
-	public String getRuntimeLabel() {
-		return runtimeName_;
-	}
-
-	/**
-	* Sets the runtime label for the appropriate runtime
-	* @param server name
-	*/
-	public void setRuntimeLabel(String runtimeLabel) {
-		runtimeName_ = runtimeLabel;
-	}
-
-	/**
-	* Returns a label for the Web Service type associated with this WebServiceServerRuntimeType
-	* @return A label for the Web Service type
-	*/
-	public String getWebServiceTypeLabel() {
-		return WebServiceAxisCreationUIPlugin.getMessage(
-			"%WEBSERVICETYPE_NAME_WSDL_AXIS");
-	}
-
-	/**
-	* Returns whether or not a Web Module is required for this WebServiceServerRuntimeType
-	* @return true if requireWebModule
-	*/
-	public boolean isWebModuleRequired() {
-		return isWebModuleRequired_;
-	}
-
-	/**
-	* Sets the boolean value at runtime according to requireWebModule attribute from the manifest file
-	* @param requireWebModule 
-	*/
-	public void setWebModuleRequired(boolean requireWebModule) {
-		isWebModuleRequired_ = requireWebModule;
-	}
-
-	/**
-	* Returns a string representation of this object.
-	* @return A string representation of this object.
-	*/
-	public String toString() {
-		return getName();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.ws.internal.consumption.ui.wizard.WebServiceServerRuntimeType#isEJBModuleRequired()
-	 */
-	public boolean isEJBModuleRequired() {
-
-		return false;
-	}
-
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.ws.internal.consumption.ui.wizard.WebServiceServerRuntimeType#setEJBModuleRequired(boolean)
-	 */
-	public void setEJBModuleRequired(boolean arg0) {
-		return;
-
-	}
-
-  /* (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.env.core.data.DataMappingRegistry)
-   */
-  public void registerDataMappings(DataMappingRegistry dataRegistry) 
-  {
-    // SkeletonConfigWidget
-    dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "JavaWSDLParam", SkeletonConfigWidgetDefaultingCommand.class);
-    dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", SkeletonConfigWidget.class, "ServerProject", new ProjectName2IProjectTransformer());
-    dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "JavaWSDLParam", SkeletonConfigWidget.class);
-    dataRegistry.addMapping(SkeletonConfigWidgetDefaultingCommand.class, "EndpointURI", SkeletonConfigWidget.class);
-    dataRegistry.addMapping(SkeletonConfigWidgetDefaultingCommand.class, "OutputWSDLFolder", SkeletonConfigWidget.class);
-    dataRegistry.addMapping(SkeletonConfigWidgetDefaultingCommand.class, "OutputWSDLFile", SkeletonConfigWidget.class);
-    dataRegistry.addMapping(SkeletonConfigWidgetDefaultingCommand.class, "OutputJavaFolder", SkeletonConfigWidget.class);
-    dataRegistry.addMapping(SkeletonConfigWidgetDefaultingCommand.class, "ShowMapping", SkeletonConfigWidget.class);
-
-    // AxisMappingsFragment
-    dataRegistry.addMapping(SkeletonConfigWidgetDefaultingCommand.class, "ShowMapping", AxisMappingsFragment.class);
-    dataRegistry.addMapping(SkeletonConfigWidget.class, "ShowMapping", AxisMappingsFragment.class);
-
-    // AxisMappingsWidget
-    dataRegistry.addMapping(SkeletonConfigWidgetDefaultingCommand.class, "JavaWSDLParam", AxisMappingsWidget.class, "JavaParameter", null);
-    dataRegistry.addMapping(SkeletonConfigWidget.class, "JavaWSDLParam", AxisMappingsWidget.class, "JavaParameter", null);
-
-    // WSDL2JavaCommand
-    dataRegistry.addMapping(SkeletonConfigWidgetDefaultingCommand.class, "JavaWSDLParam", WSDL2JavaCommand.class);
-    dataRegistry.addMapping(SkeletonConfigWidget.class, "JavaWSDLParam", WSDL2JavaCommand.class);
-    dataRegistry.addMapping(AxisMappingsWidget.class, "JavaParameter", WSDL2JavaCommand.class, "JavaWSDLParam", null);
-  }
-  
-  /* (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.add( "WSDLSelection", 
-                        msgUtils.getMessage("PAGE_TITLE_WS_SELECTION"),
-                        msgUtils.getMessage("PAGE_DESC_WS_SELECTION"),
-		                new WidgetContributorFactory()
-                        {
-		                  public WidgetContributor create()
-		                  {
-		                    return new WSDLSelectionWidget();
-		                  }
-		                } );
-
-    widgetRegistry.add( "WSDLSelectionTreeWidget", 
-        msgUtils.getMessage("PAGE_TITLE_WSDL_SELECTION"),
-        msgUtils.getMessage("PAGE_DESC_WSDL_SELECTION"),
-        new WidgetContributorFactory()
-        {
-          public WidgetContributor create()
-        {
-            return new WSDLSelectionTreeWidget();
-        }
-        });
-    */
-
-    widgetRegistry.add( "SkeletonConfig", 
-                        msgUtils.getMessage("PAGE_TITLE_WSSKEL_CONFIG"),
-                        msgUtils.getMessage("PAGE_DESC_WSSKEL_CONFIG"),
-                        new WidgetContributorFactory()
-                        {
-                          public WidgetContributor create()
-                          {
-                            return new SkeletonConfigWidget();
-                          }
-                        } );
-
-    widgetRegistry.add( "AxisMappingsWidget", 
-                        msgUtils.getMessage("PAGE_TITLE_WS_XML2BEAN"),
-                        msgUtils.getMessage("PAGE_DESC_N2P_MAPPINGS"),
-                        new WidgetContributorFactory()
-                        {
-                          public WidgetContributor create()
-                          {
-                            return new AxisMappingsWidget(AxisMappingsWidget.MODE_XML2BEAN);
-                          }
-                        } );
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.core.fragment.CommandFragmentFactoryFactory#create()
-   */
-  public CommandFragmentFactory create() 
-  {
-    return new CommandFragmentFactory()
-    {
-      public CommandFragment create()
-      {
-        return new AxisSkeletonFragment(); 
-      }
-    };
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/wsrt/AxisBeanConfigWidgetFactory.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/wsrt/AxisBeanConfigWidgetFactory.java
deleted file mode 100644
index 5300ce7..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/wsrt/AxisBeanConfigWidgetFactory.java
+++ /dev/null
@@ -1,51 +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.jst.ws.internal.axis.creation.wsrt;
-
-import org.eclipse.jst.ws.internal.axis.creation.ui.widgets.bean.BeanConfigWidget;
-import org.eclipse.jst.ws.internal.axis.creation.ui.wizard.beans.WSBeanAxisType;
-import org.eclipse.wst.command.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.provisional.ui.widgets.INamedWidgetContributor;
-import org.eclipse.wst.command.internal.provisional.ui.widgets.INamedWidgetContributorFactory;
-import org.eclipse.wst.command.internal.provisional.ui.widgets.WidgetBindingToWidgetFactoryAdapter;
-
-public class AxisBeanConfigWidgetFactory implements INamedWidgetContributorFactory {
-
-	private INamedWidgetContributor             beanConfigWidget_;
-	private INamedWidgetContributor             mappingsWidget_;
-	private BeanConfigWidget                    beanWidget_;
-	private WidgetBindingToWidgetFactoryAdapter adapter_;
-	
-	public AxisBeanConfigWidgetFactory()
-	{
-	  adapter_ = new WidgetBindingToWidgetFactoryAdapter( new WSBeanAxisType() );
-	  
-	  beanConfigWidget_ = adapter_.getWidget( "BeanConfig" );
-	  beanWidget_       = (BeanConfigWidget)beanConfigWidget_.getWidgetContributorFactory().create();
-	  mappingsWidget_   = adapter_.getWidget( "AxisServiceBeanMapping" );
-	}
-	
-	public INamedWidgetContributor getFirstNamedWidget() 
-	{
-	  return beanConfigWidget_;
-	}
-
-	public INamedWidgetContributor getNextNamedWidget( INamedWidgetContributor widgetContributor) 
-	{
-	  return widgetContributor == beanConfigWidget_ && beanWidget_.getCustomizeServiceMappings() ? mappingsWidget_ : null;
-	}
-	
-	public void registerDataMappings(DataMappingRegistry dataRegistry) 
-	{
-	  adapter_.registerDataMappings( dataRegistry );
-	}
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/wsrt/AxisSkeletonConfigWidgetFactory.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/wsrt/AxisSkeletonConfigWidgetFactory.java
deleted file mode 100644
index ed25489..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/wsrt/AxisSkeletonConfigWidgetFactory.java
+++ /dev/null
@@ -1,51 +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.jst.ws.internal.axis.creation.wsrt;
-
-import org.eclipse.jst.ws.internal.axis.creation.ui.widgets.skeleton.SkeletonConfigWidget;
-import org.eclipse.jst.ws.internal.axis.creation.ui.wizard.wsdl.WSWSDLAxisType;
-import org.eclipse.wst.command.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.provisional.ui.widgets.INamedWidgetContributor;
-import org.eclipse.wst.command.internal.provisional.ui.widgets.INamedWidgetContributorFactory;
-import org.eclipse.wst.command.internal.provisional.ui.widgets.WidgetBindingToWidgetFactoryAdapter;
-
-public class AxisSkeletonConfigWidgetFactory implements INamedWidgetContributorFactory {
-
-	private INamedWidgetContributor             skelConfigWidget_;
-	private INamedWidgetContributor             mappingsWidget_;
-	private SkeletonConfigWidget                skelWidget_;
-	private WidgetBindingToWidgetFactoryAdapter adapter_;
-	
-	public AxisSkeletonConfigWidgetFactory()
-	{
-	  adapter_ = new WidgetBindingToWidgetFactoryAdapter( new WSWSDLAxisType() );
-	  
-	  skelConfigWidget_ = adapter_.getWidget( "SkeletonConfig" );
-	  skelWidget_       = (SkeletonConfigWidget)skelConfigWidget_.getWidgetContributorFactory().create();
-	  mappingsWidget_   = adapter_.getWidget( "AxisMappingsWidget" );
-	}
-	
-	public INamedWidgetContributor getFirstNamedWidget() 
-	{
-	  return skelConfigWidget_;
-	}
-
-	public INamedWidgetContributor getNextNamedWidget( INamedWidgetContributor widgetContributor) 
-	{
-	  return widgetContributor == skelConfigWidget_ && skelWidget_.getShowMapping() ? mappingsWidget_ : null;
-	}
-	
-	public void registerDataMappings(DataMappingRegistry dataRegistry) 
-	{
-	  adapter_.registerDataMappings( dataRegistry );
-	}
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/wsrt/AxisWebService.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/wsrt/AxisWebService.java
deleted file mode 100644
index 8338786..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/wsrt/AxisWebService.java
+++ /dev/null
@@ -1,343 +0,0 @@
-package org.eclipse.jst.ws.internal.axis.creation.wsrt;
-
-import java.util.Vector;
-
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.AxisDeployCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.Java2WSDLCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.WSDL2JavaCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.AddJarsToProjectBuildPathTask;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.CheckAxisDeploymentDescriptorsTask;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.CopyAxisJarCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.RefreshProjectCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.ValidateWSDLCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.command.AxisOutputCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.command.AxisRunInputCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.command.BUAxisInputCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.command.ComputeAxisSkeletonBeanCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.command.JavaToWSDLMethodCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.command.TDAxisInputCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.command.UpdateWEBXMLCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.BUCheckAxisDeploymentDescriptors;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.DefaultsForServerJavaWSDLCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.LiteralSupportMessageTask;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.MoveDeploymentFilesTask;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.MoveJavaFilesTask;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.Skeleton2WSDLCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.TDCheckAxisDeploymentDescriptors;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.UpdateAxisWSDDFileTask;
-import org.eclipse.jst.ws.internal.axis.creation.ui.widgets.bean.AxisBeanFragment;
-import org.eclipse.jst.ws.internal.axis.creation.ui.widgets.bean.BUAxisDefaultingCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.widgets.bean.ValidateObjectSelectionCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.widgets.skeleton.AxisSkeletonDefaultingCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.widgets.skeleton.SkeletonConfigWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.common.StringToIProjectTransformer;
-import org.eclipse.jst.ws.internal.consumption.command.common.BuildProjectCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.StartProjectCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.command.OpenJavaEditorCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.command.WSINonCompliantRuntimeCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.command.data.ProjectName2IProjectTransformer;
-import org.eclipse.jst.ws.internal.consumption.ui.command.data.ServerName2IServerTransformer;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ObjectSelectionOutputCommand;
-import org.eclipse.wst.command.env.common.WaitForAutoBuildCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.env.ui.widgets.SelectionCommand;
-import org.eclipse.wst.command.internal.provisional.ICommandFactory;
-import org.eclipse.wst.command.internal.provisional.SimpleCommandFactory;
-import org.eclipse.wst.ws.internal.provisional.wsrt.AbstractWebService;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IContext;
-import org.eclipse.wst.ws.internal.provisional.wsrt.ISelection;
-import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceInfo;
-import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceScenario;
-
-public class AxisWebService extends AbstractWebService
-{
-	private AxisWebServiceInfo axisWebServiceInfo_;
-
-	public AxisWebService(WebServiceInfo info)
-	{
-		super(info);
-	}
-
-	public ICommandFactory assemble(Environment env, IContext ctx,
-			ISelection sel, String module, String ear)
-	{
-		return null;
-	}
-
-	public ICommandFactory deploy(Environment env, IContext ctx, ISelection sel,
-			String module, String ear)
-	{
-		return null;
-	}
-
-	public ICommandFactory develop(Environment env, IContext ctx, ISelection sel,
-			String module, String ear)
-	{
-		
-		Vector commands = new Vector();
-		
-		if (ctx.getScenario().getValue() == WebServiceScenario.BOTTOMUP) {
-			
-			registerBUDataMappings( env.getCommandManager().getMappingRegistry());
-			
-			commands.add(new BUAxisInputCommand(this, module));
-			commands.add(new ValidateObjectSelectionCommand());
-			commands.add(new BUAxisDefaultingCommand());
-			commands.add(new WSINonCompliantRuntimeCommand());
-			commands.add(new DefaultsForServerJavaWSDLCommand());
-			commands.add(new JavaToWSDLMethodCommand());
-			// commands.add(new SimpleFragment( "BeanConfig" ));
-			// commands.add(new SimpleFragment( "AxisServiceBeanMapping" ));
-			commands.add(new BUCheckAxisDeploymentDescriptors());
-			commands.add(new LiteralSupportMessageTask());
-			commands.add(new CopyAxisJarCommand());
-			commands.add(new AddJarsToProjectBuildPathTask());
-			commands.add(new WaitForAutoBuildCommand());
-			commands.add(new Java2WSDLCommand());
-			commands.add(new RefreshProjectCommand());
-			commands.add(new WSDL2JavaCommand());
-			commands.add(new MoveJavaFilesTask());
-			commands.add(new UpdateAxisWSDDFileTask());
-			commands.add(new UpdateWEBXMLCommand());
-			commands.add(new RefreshProjectCommand());
-			commands.add(new BuildProjectCommand());
-			commands.add(new StartProjectCommand());
-			commands.add(new AxisOutputCommand(this));
-			
-		} else if (ctx.getScenario().getValue() == WebServiceScenario.TOPDOWN) {
-			
-			registerTDDataMappings( env.getCommandManager().getMappingRegistry());
-			
-			commands.add(new TDAxisInputCommand(this, module));
-			commands.add(new AxisSkeletonDefaultingCommand());
-		    commands.add(new ValidateWSDLCommand());
-		    commands.add(new SkeletonConfigWidgetDefaultingCommand());
-//			commands.add(new SimpleFragment( "SkeletonConfig" ));
-//			commands.add(new SimpleFragment( "AxisMappingsWidget" ));
-		    commands.add(new TDCheckAxisDeploymentDescriptors());
-		    commands.add(new AddJarsToProjectBuildPathTask());
-		    commands.add(new CopyAxisJarCommand());
-		    commands.add(new WSDL2JavaCommand());
-		    commands.add(new MoveDeploymentFilesTask());
-		    commands.add(new Skeleton2WSDLCommand());
-		    commands.add(new UpdateWEBXMLCommand());
-		    commands.add(new RefreshProjectCommand());
-		    commands.add(new BuildProjectCommand());
-		    commands.add(new StartProjectCommand());
-		    commands.add(new BuildProjectCommand());
-			commands.add(new ComputeAxisSkeletonBeanCommand());
-			commands.add(new AxisOutputCommand(this));
-			
-		} else {
-			System.out.println("Error - WebServiceScenario should not be Client for AxisWebService");
-		}
-		
-		
-		return new SimpleCommandFactory(commands);
-	}
-
-	public ICommandFactory install(Environment env, IContext ctx, ISelection sel,
-			String module, String ear)
-	{
-		return null;
-	}
-
-	public ICommandFactory run(Environment env, IContext ctx, ISelection sel,
-			String module, String ear)
-	{
-		Vector commands = new Vector();
-		if (ctx.getScenario().getValue() == WebServiceScenario.BOTTOMUP) {
-			commands.add(new AxisRunInputCommand(this, module));
-			commands.add(new AxisDeployCommand());
-			commands.add(new RefreshProjectCommand());
-		} else if (ctx.getScenario().getValue() == WebServiceScenario.TOPDOWN) {
-			commands.add(new AxisRunInputCommand(this, module));
-			commands.add(new AxisDeployCommand());
-			commands.add(new RefreshProjectCommand());
-			commands.add(new OpenJavaEditorCommand());
-		} else {
-			System.out
-					.println("Error - WebServiceScenario should not be Client for AxisWebService");
-		}
-		return new SimpleCommandFactory(commands);
-	}
-	
-	public void registerBUDataMappings(DataMappingRegistry registry) 
-	  {
-		//BUAxisInputCommand
-		registry.addMapping(BUAxisInputCommand.class, "ServiceServerTypeID", StartProjectCommand.class);
-
-		
-	    //ValidateObjectSelectionCommand
-	    registry.addMapping(ObjectSelectionOutputCommand.class, "ObjectSelection", ValidateObjectSelectionCommand.class);
-	    registry.addMapping(BUAxisInputCommand.class, "ServerProject", ValidateObjectSelectionCommand.class,"ServiceProjectName", null );
-	    
-	    //BUAxisDefaultingCommand
-	    registry.addMapping(SelectionCommand.class, "InitialSelection", BUAxisDefaultingCommand.class );
-//KSC   registry.addMapping(BUAxisInputCommand.class, "ServiceTypeRuntimeServer", BUAxisDefaultingCommand.class );
-	    
-	    //WSINonCompliantRuntimeCommand
-	    registry.addMapping(BUAxisInputCommand.class, "ServerProject", WSINonCompliantRuntimeCommand.class, "ServiceProject", new StringToIProjectTransformer());
-	    
-	    //BUAxisCommands2 - these run after BeanClassWidget
-	    //DefaultsForServerJavaWSDLCommand
-	    registry.addMapping(BUAxisDefaultingCommand.class, "JavaWSDLParam", DefaultsForServerJavaWSDLCommand.class);
-	    registry.addMapping(BUAxisInputCommand.class, "ServerProject", DefaultsForServerJavaWSDLCommand.class, "ServiceProject", new StringToIProjectTransformer());
-	    registry.addMapping(BUAxisDefaultingCommand.class, "JavaBeanName", DefaultsForServerJavaWSDLCommand.class);
-	    registry.addMapping(BUAxisDefaultingCommand.class, "Parser", DefaultsForServerJavaWSDLCommand.class);
-	    registry.addMapping(BUAxisDefaultingCommand.class, "CustomizeServiceMappings", AxisBeanFragment.MappingFragment.class);
-	    
-	    //JavaWSDLMethodCommand
-	    registry.addMapping(DefaultsForServerJavaWSDLCommand.class, "JavaWSDLParam", JavaToWSDLMethodCommand.class);
-	    registry.addMapping(BUAxisInputCommand.class, "ServerProject", JavaToWSDLMethodCommand.class, "ServiceProject", new StringToIProjectTransformer());
-
-	    // BUAxisCommands3 - these run after BeanConfigWidget
-	    //LiteralSupportMessageTask
-	    registry.addMapping(JavaToWSDLMethodCommand.class, "JavaWSDLParam", LiteralSupportMessageTask.class);
-	    
-	    //CheckAxisDeploymentDescriptorsTask
-	    //registry.addMapping(JavaToWSDLMethodCommand.class, "JavaWSDLParam", CheckAxisDeploymentDescriptorsTask.class);
-	    registry.addMapping(BUAxisInputCommand.class, "ServerProject", CheckAxisDeploymentDescriptorsTask.class, "ServerProject", new StringToIProjectTransformer());
-	    
-	    //CopyAxisJarCommand
-	    registry.addMapping(BUAxisInputCommand.class, "ServerProject", CopyAxisJarCommand.class, "Project", new StringToIProjectTransformer());
-	    
-	    //AddJarsToProjectBuildPathTask
-	    registry.addMapping(BUAxisInputCommand.class, "ServerProject", AddJarsToProjectBuildPathTask.class, "Project", new StringToIProjectTransformer());
-	    
-	    //Java2WSDLCommand
-	    registry.addMapping(JavaToWSDLMethodCommand.class, "JavaWSDLParam", Java2WSDLCommand.class);
-	    
-	    //RefreshProjectCommand
-	    registry.addMapping(BUAxisInputCommand.class, "ServerProject", RefreshProjectCommand.class, "Project", new StringToIProjectTransformer());
-	    
-	    //WSDL2JavaCommand
-	    registry.addMapping(JavaToWSDLMethodCommand.class, "JavaWSDLParam", WSDL2JavaCommand.class);
-	    
-
-	    //MoveJavaFilesTask
-	    registry.addMapping(WSDL2JavaCommand.class, "JavaWSDLParam", MoveJavaFilesTask.class);
-	    registry.addMapping(BUAxisInputCommand.class, "ServerProject", MoveJavaFilesTask.class, "ServiceProject", new StringToIProjectTransformer());
-	    
-	    //UpdateAxisWSDDFileTask
-	    registry.addMapping(MoveJavaFilesTask.class, "JavaWSDLParam", UpdateAxisWSDDFileTask.class);
-	    registry.addMapping(BUAxisInputCommand.class, "ServerProject", UpdateAxisWSDDFileTask.class, "ServiceProject", new StringToIProjectTransformer());
-	    
-	    //UpdateWEBXMLCommand
-	    registry.addMapping(BUAxisInputCommand.class, "ServerProject", UpdateWEBXMLCommand.class, "ServerProject", new StringToIProjectTransformer());
-	    
-	    //BuildProjectCommand
-	    registry.addMapping(BUAxisInputCommand.class, "ServerProject", BuildProjectCommand.class, "Project", new StringToIProjectTransformer());
-	    registry.addMapping(BUAxisDefaultingCommand.class, "ForceBuild", BuildProjectCommand.class);
-	    registry.addMapping(BUAxisDefaultingCommand.class, "ValidationManager", BuildProjectCommand.class);
-	    
-	    //StartProjectCommand
-	    registry.addMapping(BUAxisInputCommand.class, "ServerProject", StartProjectCommand.class, "ServiceProject", new StringToIProjectTransformer());    
-	    registry.addMapping(BUAxisDefaultingCommand.class, "SampleProject", StartProjectCommand.class);
-//KSC   registry.addMapping(BUAxisDefaultingCommand.class, "ServiceServerTypeID", StartProjectCommand.class);
-	    registry.addMapping(BUAxisDefaultingCommand.class, "SampleServerTypeID", StartProjectCommand.class);
-	    registry.addMapping(BUAxisDefaultingCommand.class, "ServiceExistingServer", StartProjectCommand.class);
-	    registry.addMapping(BUAxisDefaultingCommand.class, "SampleExistingServer", StartProjectCommand.class);
-	    registry.addMapping(BUAxisDefaultingCommand.class, "IsWebProjectStartupRequested",StartProjectCommand.class);
-	        
-		// AxisOutputCommand
-	    registry.addMapping(Java2WSDLCommand.class, "WsdlURI", AxisOutputCommand.class);
-		registry.addMapping(UpdateAxisWSDDFileTask.class, "JavaWSDLParam", AxisOutputCommand.class);    
-		
-		// Run extension
-		
-	    //AxisDeployCommand
-	    registry.addMapping(AxisRunInputCommand.class, "JavaWSDLParam", AxisDeployCommand.class);
-		//RefreshProjectCommand
-	    registry.addMapping(AxisRunInputCommand.class, "ServerProject", RefreshProjectCommand.class, "Project", new StringToIProjectTransformer());
-
-	    
-	    
-	  }
-
-	public void registerTDDataMappings(DataMappingRegistry dataRegistry)
-	  {
-	    // Transformers
-	    ProjectName2IProjectTransformer projectTransformer = new ProjectName2IProjectTransformer();
-
-		// TODO:  map "InitialSelection" and "ObjectSelection" from TDAxisInputCommand
-		
-//	    dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", AxisSkeletonDefaultingCommand.class);
-//	    dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "ObjectSelection", AxisSkeletonDefaultingCommand.class);
-//	    dataRegistry.addMapping(TDAxisInputCommand.class, "WebServicesParser", AxisSkeletonDefaultingCommand.class);
-	    
-		dataRegistry.addMapping(TDAxisInputCommand.class, "WsdlURI", AxisSkeletonDefaultingCommand.class);
-	    // ValidateWSDLCommand
-	    dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "WebServicesParser", ValidateWSDLCommand.class);
-	    dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "WsdlURI", ValidateWSDLCommand.class);
-	    
-	    // SkeletonConfigWidgetDefaultingCommand
-	    dataRegistry.addMapping(TDAxisInputCommand.class, "ServerProject", SkeletonConfigWidgetDefaultingCommand.class);
-	    dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "WsdlURI", SkeletonConfigWidgetDefaultingCommand.class);
-	    
-	    // CheckAxisDeploymentDescriptorsTask
-	    dataRegistry.addMapping(TDAxisInputCommand.class, "ServerProject", CheckAxisDeploymentDescriptorsTask.class, "ServerProject", projectTransformer);
-
-	    // AddJarsToProjectBuildPathTask
-	    dataRegistry.addMapping(TDAxisInputCommand.class, "ServerProject", AddJarsToProjectBuildPathTask.class, "Project", projectTransformer);
-	    
-	    dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "WsdlURI", WSDL2JavaCommand.class);
-	    dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "HttpBasicAuthUsername", WSDL2JavaCommand.class);
-	    dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "HttpBasicAuthPassword", WSDL2JavaCommand.class);
-
-//		WSDL2JavaCommand
-	  	dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "JavaWSDLParam", WSDL2JavaCommand.class);
-		
-	    // MoveDeploymentFilesTask
-	    dataRegistry.addMapping(TDAxisInputCommand.class, "ServerProject", MoveDeploymentFilesTask.class, "ServerProject", projectTransformer);
-	    dataRegistry.addMapping(WSDL2JavaCommand.class, "JavaWSDLParam", MoveDeploymentFilesTask.class);
-
-	    // CopyAxisJarCommand
-	    dataRegistry.addMapping(TDAxisInputCommand.class, "ServerProject", CopyAxisJarCommand.class, "Project", projectTransformer);
-
-	    // Skeleton2WSDLCommand
-	    dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "WebServicesParser", Skeleton2WSDLCommand.class);
-	    dataRegistry.addMapping(TDAxisInputCommand.class, "ServerProject", Skeleton2WSDLCommand.class, "ServerProject", projectTransformer);
-	    dataRegistry.addMapping(WSDL2JavaCommand.class, "JavaWSDLParam", Skeleton2WSDLCommand.class);
-
-	    // UpdateWEBXMLCommand
-	    dataRegistry.addMapping(TDAxisInputCommand.class, "ServerProject", UpdateWEBXMLCommand.class, "ServerProject", projectTransformer);
-
-	    // RefreshProjectCommand
-	    dataRegistry.addMapping(TDAxisInputCommand.class, "ServerProject", RefreshProjectCommand.class, "Project", projectTransformer);
-	    
-	    // BuildProjectCommand
-	    dataRegistry.addMapping(TDAxisInputCommand.class, "ServerProject", BuildProjectCommand.class, "Project", projectTransformer);
-
-	    // StartProjectCommand
-	    dataRegistry.addMapping(TDAxisInputCommand.class, "ServerProject", StartProjectCommand.class, "ServiceProject", projectTransformer);
-	    dataRegistry.addMapping(TDAxisInputCommand.class, "ServerServer", StartProjectCommand.class, "ServiceExistingServer", new ServerName2IServerTransformer());
-	    dataRegistry.addMapping(CopyAxisJarCommand.class, "ProjectRestartRequired", StartProjectCommand.class, "IsWebProjectStartupRequested", null);
-
-	    // AxisDeployCommand
-	    dataRegistry.addMapping(WSDL2JavaCommand.class, "JavaWSDLParam", AxisDeployCommand.class);
-	    
-	    // AxisOutputCommand
-	    dataRegistry.addMapping(Skeleton2WSDLCommand.class, "WsdlURI", AxisOutputCommand.class);
-		dataRegistry.addMapping(WSDL2JavaCommand.class, "JavaWSDLParam", AxisOutputCommand.class); 
-//	    dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "WebServicesParser", AxisOutputCommand.class);
-	    
-	    // ComputeAxisSkeletonBeanCommand
-	    dataRegistry.addMapping(WSDL2JavaCommand.class, "JavaWSDLParam", ComputeAxisSkeletonBeanCommand.class);
-	    //dataRegistry.addMapping(Skeleton2WSDLCommand.class, "WsdlURI", ComputeAxisSkeletonBeanCommand.class);
-	    //dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "WebServicesParser", ComputeAxisSkeletonBeanCommand.class);
-	    
-	    // OpenJavaEditorCommand
-	    dataRegistry.addMapping(ComputeAxisSkeletonBeanCommand.class, "ClassNames", OpenJavaEditorCommand.class);
-	    dataRegistry.addMapping(TDAxisInputCommand.class, "ServerProject", OpenJavaEditorCommand.class, "Project", projectTransformer);
-	  }
-	public AxisWebServiceInfo getAxisWebServiceInfo() {
-		return axisWebServiceInfo_;
-	}
-
-	public void setAxisWebServiceInfo(AxisWebServiceInfo axisWebServiceInfo) {
-		axisWebServiceInfo_ = axisWebServiceInfo;
-	}
-}	
-
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/wsrt/AxisWebServiceInfo.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/wsrt/AxisWebServiceInfo.java
deleted file mode 100644
index 3e0ad70..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/wsrt/AxisWebServiceInfo.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.axis.creation.wsrt;
-
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-
-public class AxisWebServiceInfo {
-	
-	private JavaWSDLParameter javaWSDLParameter;
-
-	public JavaWSDLParameter getJavaWSDLParameter() {
-		return javaWSDLParameter;
-	}
-
-	public void setJavaWSDLParameter(JavaWSDLParameter javaWSDLParameter) {
-		this.javaWSDLParameter = javaWSDLParameter;
-	}
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/wsrt/AxisWebServiceRuntime.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/wsrt/AxisWebServiceRuntime.java
deleted file mode 100644
index 95967e3..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/wsrt/AxisWebServiceRuntime.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.eclipse.jst.ws.internal.axis.creation.wsrt;
-
-import org.eclipse.jst.ws.internal.axis.consumption.wsrt.AxisWebServiceClient;
-import org.eclipse.wst.ws.internal.provisional.wsrt.AbstractWebServiceRuntime;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebService;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceClient;
-import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceClientInfo;
-import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceInfo;
-
-public class AxisWebServiceRuntime extends AbstractWebServiceRuntime
-{
-
-	public IWebService getWebService(WebServiceInfo info)
-	{
-    return new AxisWebService(info);
-	}
-
-	public IWebServiceClient getWebServiceClient(WebServiceClientInfo info)
-	{
-		return new AxisWebServiceClient(info);
-	}
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/.classpath b/bundles/org.eclipse.jst.ws.consumption.ui/.classpath
deleted file mode 100644
index 275b34c..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.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.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/.cvsignore b/bundles/org.eclipse.jst.ws.consumption.ui/.cvsignore
deleted file mode 100644
index 491c19c..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-build.xml
-temp.folder
-wsc-ui.jar
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/.project b/bundles/org.eclipse.jst.ws.consumption.ui/.project
deleted file mode 100644
index 67d2e8a..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/.project
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.ws.consumption.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.discovery.core</project>
-		<project>org.eclipse.jst.ws.ui</project>
-		<project>org.eclipse.wst.wsdl</project>
-		<project>org.eclipse.wst.ws.parser</project>
-		<project>org.eclipse.wst.ws.apache.wsil</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.consumption.ui/build.properties b/bundles/org.eclipse.jst.ws.consumption.ui/build.properties
deleted file mode 100644
index 3c0b3bd..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/build.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-source.wsc-ui.jar = src/
-bin.includes = wsc-ui.jar,\
-               icons/,\
-               plugin.properties,\
-               plugin.xml
-src.includes = build.properties,\
-               doc/,\
-               icons/,\
-               plugin.properties,\
-               plugin.xml,\
-               src/,\
-               schema/
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/config_handler_wiz.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/config_handler_wiz.gif
deleted file mode 100644
index 8da3a21..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/config_handler_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/ctool16/configure_handlers.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/ctool16/configure_handlers.gif
deleted file mode 100644
index a113c85..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/ctool16/configure_handlers.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/ctool16/generated_sample.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/ctool16/generated_sample.gif
deleted file mode 100644
index eaba51f..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/ctool16/generated_sample.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/ctool16/newclient_webserv_wiz.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/ctool16/newclient_webserv_wiz.gif
deleted file mode 100644
index 1ee05fa..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/ctool16/newclient_webserv_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/dtool/configure_handlers.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/dtool/configure_handlers.gif
deleted file mode 100644
index 1060dd9..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/dtool/configure_handlers.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/dtool/generated_sample.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/dtool/generated_sample.gif
deleted file mode 100644
index 590d396..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/dtool/generated_sample.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/wizban/webservicesclient_wiz.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/wizban/webservicesclient_wiz.gif
deleted file mode 100644
index 68b7a26..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/wizban/webservicesclient_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/gen_sample_wiz.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/gen_sample_wiz.gif
deleted file mode 100644
index 927ad5a..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/gen_sample_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/import_ws.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/import_ws.gif
deleted file mode 100644
index 641fe84..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/import_ws.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/import_ws_wiz.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/import_ws_wiz.gif
deleted file mode 100644
index a3061e6..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/import_ws_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/registry.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/registry.gif
deleted file mode 100644
index 5b43cae..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/registry.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/servers/existing_server_obj.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/servers/existing_server_obj.gif
deleted file mode 100644
index afb6cb7..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/servers/existing_server_obj.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/servers/servers_obj.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/servers/servers_obj.gif
deleted file mode 100644
index afb6cb7..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/servers/servers_obj.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/html.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/html.gif
deleted file mode 100644
index 53e7dbd..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/html.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/import_wiz_banner_wsil.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/import_wiz_banner_wsil.gif
deleted file mode 100644
index 11b34b7..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/import_wiz_banner_wsil.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/import_wsil.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/import_wsil.gif
deleted file mode 100644
index 618a946..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/import_wsil.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/wsdl.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/wsdl.gif
deleted file mode 100644
index 8fb844f..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/wsdl.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/wsil.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/wsil.gif
deleted file mode 100644
index 7c5916f..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/wsil.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/plugin.properties b/bundles/org.eclipse.jst.ws.consumption.ui/plugin.properties
deleted file mode 100644
index ccd3738..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/plugin.properties
+++ /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
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-PLUGIN_NAME=Web Services Consumption Graphical User Interface
-PLUGIN_PROVIDER=Eclipse.org
-
-FEATURE_DESCRIPTION=Web services
-
-XP_PUBLIC_UDDI_REGISTRY_TYPES=Public UDDI Registry Types
-XP_PRIVATE_UDDI_REGISTRY_TYPES=Private UDDI Registry Types
-XP_WEB_SERVICE_CLIENT_TYPES=Web Service Client Types
-XP_WEB_SERVICE_TEST=Web Service Test
-XP_WEB_SERVICE_SERVER_RUNTIME_TYPES=Web Service Server Runtime Types
-XP_WEB_SERVICE_CLIENT_PROJECT_TYPE=clientProjectType
-XP_OBJECT_SELECTION_WIDGET=objectSelectionWidget
-
-#
-# Wizards.
-#
-WIZARD_TITLE_WSC=Web Service Client
-
-PLUGIN_NEW_WIZARD_NAME_WS_CLIENT=Web Service Client
-PLUGIN_IMPORT_WIZARD_NAME_WS=Web Service
-PLUGIN_NEW_WIZARD_DESC_WS_CLIENT=Access an existing XML web service
-PLUGIN_IMPORT_WIZARD_DESC_WS=A wizard for importing a web service
-IMPORT_WIZARD_DESC_WSIL=Import WSDL references to a WSIL document
-
-#
-# Web Samples IDs
-#
-SAMPLE_TYPE_WEBSERVICES_ID=Web service sample JSPs
-
-#
-# Pop-up actions
-#
-ACTION_GENERATE_JAVA_PROXY=Generate Client
-ACTION_GEN_SAMPLE=Generate Sample JSPs
-
-#
-# Dialogs
-#
-CHECKBOX_SHOW_GENERATE_JAVA_PROXY_DIALOG=Hide Generate Java bean Proxy Dialog
-CHECKBOX_SHOW_PROXY2SAMPLE_DIALOG=Hide Proxy To Sample Generation Dialog
-TOOLTIP_PPAD_CHECKBOX_WSDL2PROXY=Hide the dialog for generating the Java bean proxy action.
-TOOLTIP_PPAD_CHECKBOX_PROXY2SAMPLE=Hide the dialog for generating the sample application action.
-
-#
-#       Web Services Preferance Pages
-#
-# Categories
-
-PREFERENCE_CATEGORY_SERVER_RUNTIME=Server and Runtime
-PREFERENCE_CATEGORY_PROJECT_TOPOLOGY=Project Topology
-PREFERENCE_CATEGORY_TEST_FACILITY=Test Facility Defaults
-PREFERENCE_CATEGORY_DIALOGS=Popup Dialog Selection
-
-
-#
-# Pop-up actions
-#
-MENU_RUN=&Run
-
-#
-# WebServiceTestPage
-#
-WSEXPLORER_ID=Web Services Explorer
-
-#
-# WebServicePublishPage
-#
-TOOLTIP_LAUNCH_WS_EXPLORER=Launch the Web Services Explorer
-COMMAND_LAUNCH_WS_EXPLORER=Launch the Web Services Explorer
-
-#
-# 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
-
-#
-# WSIL proxy
-#
-IMPORT_WIZARD_NAME_WSIL=WSIL
-POPUP_GENERATE_WSIL=Generate WSIL
-
-#
-# Web Service Server Runtime Type
-#
-WEBSERVICETYPE_NAME_WSDL=Skeleton Java bean Web Service
-WEBSERVICETYPE_NAME_JAVA=Java bean Web Service
-
-#
-# Client project type
-#
-LABEL_CLIENT_TYPE_WEB=Web
-LABEL_CLIENT_TYPE_EJB=EJB
-LABEL_CLIENT_TYPE_APP_CLIENT=Application Client
-LABEL_CLIENT_TYPE_CONTAINERLESS=Java
-
-#
-# Handlers Configuration wizard page
-#
-POPUP_ADD_HANDLERS=Configure handlers
-LABEL_HANDLERS_CONFIG=Configure Handlers
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/plugin.xml b/bundles/org.eclipse.jst.ws.consumption.ui/plugin.xml
deleted file mode 100644
index a7d9462..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/plugin.xml
+++ /dev/null
@@ -1,908 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin
-   id="org.eclipse.jst.ws.consumption.ui"
-   version="1.0.0"
-   name="%PLUGIN_NAME"
-   provider-name="%PLUGIN_PROVIDER"
-   class="org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin">
-
-   <runtime>
-      <library name="wsc-ui.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-
-   <requires>
-      <import plugin="org.eclipse.wst.ws.parser"/>
-      <import plugin="org.eclipse.wst.command.env"/>
-      <import plugin="org.eclipse.wst.command.env.ui"/>
-      <import plugin="org.eclipse.wst.command.env.core"/>
-      <!--
-      Should not need the following import, but absence causes
-      ClientHandlersWidgetOutputCommand to fail to compile due to
-      missing indirect dependency on
-      org.eclipse.jst.common.jdt.internal.integration.WorkingCopyProvider
-      -->
-      <import plugin="org.eclipse.jst.common.frameworks"/>
-      <import plugin="org.eclipse.jst.ws.explorer"/>
-      <import plugin="org.eclipse.jst.ws"/>
-      <import plugin="org.eclipse.jst.ws.ui"/>
-      <import plugin="org.eclipse.jst.ws.consumption"/>
-      <import plugin="org.eclipse.jem"/>
-	  <import plugin="org.eclipse.jem.workbench"/>
-      <import plugin="org.eclipse.emf.common"/>
-      <import plugin="org.eclipse.emf.ecore"/>
-      <import plugin="org.eclipse.jdt.core"/>
-      <import plugin="org.eclipse.jdt.ui"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.debug.core"/>
-      <import plugin="org.eclipse.wst.ws"/>
-      <import plugin="org.eclipse.jem.workbench"/>
-      <import plugin="org.eclipse.emf.ecore.xmi"/>
-      <import plugin="org.eclipse.wst.server.core"/>
-      <import plugin="org.eclipse.wst.server.ui"/>
-      <import plugin="org.eclipse.wst.wsdl"/>
-      <import plugin="org.eclipse.jst.j2ee"/>
-      <import plugin="org.eclipse.jst.j2ee.core"/>
-      <import plugin="org.eclipse.jst.j2ee.ejb"/>
-      <import plugin="org.eclipse.jst.j2ee.ui"/>
-      <import plugin="org.eclipse.jst.j2ee.web"/>
-      <import plugin="org.eclipse.wst.common.emf"/>
-      <import plugin="org.eclipse.wst.common.emfworkbench.integration"/>
-      <import plugin="org.eclipse.wst.common.frameworks"/>
-      <import plugin="org.eclipse.wst.internet.webbrowser"/>
-      <import plugin="org.eclipse.jst.j2ee.webservice"/>
-      <import plugin="org.eclipse.jst.j2ee.webservices.ui"/>
-      <import plugin="org.eclipse.wst.common.dependencychecker"/>
-      <import plugin="org.eclipse.wst.common.modulecore"/>
-      <import plugin="org.eclipse.wst.ws.ui"/>
-      <import plugin="org.wsdl4j"/>
-      <import plugin="org.apache.wsil4j"/>
-   </requires>
-
-   <!-- Third party file dependencies -->
-   <extension point="org.eclipse.wst.common.dependencychecker.dependencies">
-      <dependency description="%FEATURE_DESCRIPTION">
-         <requiredPlugin id="org.eclipse.wst.ws.apache.axis"/>
-         <requiredPlugin id="org.eclipse.wst.ws.apache.wsil"/>
-         <requiredPlugin id="org.eclipse.wst.ws.uddi4j"/>
-         <requiredPlugin id="org.eclipse.wst.wsdl"/>
-      </dependency>
-   </extension>
-
-   <extension-point
-      id="publicUDDIRegistryType"
-      name="%XP_PUBLIC_UDDI_REGISTRY_TYPES"/>
-
-   <extension-point
-      id="privateUDDIRegistryType"
-      name="%XP_PRIVATE_UDDI_REGISTRY_TYPES"/>
-
-   <extension-point
-      id="webServiceClientType"
-      name="%XP_WEB_SERVICE_CLIENT_TYPES"
-      schema="schema/webServiceClientType.exsd"/>
-
-   <extension-point
-      id="webServiceTest"
-      name="%XP_WEB_SERVICE_TEST"
-      schema="schema/webServiceTest.exsd"/>
-
-   <extension-point
-      id="webServiceServerRuntimeType"
-      name="%XP_WEB_SERVICE_SERVER_RUNTIME_TYPES"
-      schema="schema/webServiceServerRuntimeType.exsd"/>
-
-   <extension-point
-      id="clientProjectType"
-      name="%XP_WEB_SERVICE_CLIENT_PROJECT_TYPE"
-      schema="schema/clientProjectType.exsd"/>   
-
-   <extension-point
-      id="objectSelectionWidget"
-      name="%XP_OBJECT_SELECTION_WIDGET"
-      schema="schema/objectSelectionWidget.exsd"/>
-
-
-   <!-- Third party file dependencies -->
-   <extension point="org.eclipse.wst.common.dependencychecker.dependencies">
-     <dependency description="%FEATURE_DESCRIPTION">
-       <requiredPlugin id="org.eclipse.wst.ws.apache.axis"/>
-       <requiredPlugin id="org.eclipse.wst.ws.apache.wsil"/>
-       <requiredPlugin id="org.eclipse.wst.ws.uddi4j"/>
-       <requiredPlugin id="org.eclipse.wst.wsdl"/>
-     </dependency>
-   </extension>
-   
-   <!-- UDDI Registry Types -->
-   
-   <extension
-         point="org.eclipse.jst.ws.consumption.ui.publicUDDIRegistryType">
-      <publicUDDIRegistryType
-            name="%PUBLICUDDIREGISTRYTYPE_NAME_IBM_TEST"
-            class="org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistryIBMTest"
-            id="org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistryIBMTest">
-      </publicUDDIRegistryType>
-   </extension>
-
-   <extension
-         point="org.eclipse.jst.ws.consumption.ui.publicUDDIRegistryType">
-      <publicUDDIRegistryType
-            name="%PUBLICUDDIREGISTRYTYPE_NAME_IBM"
-            class="org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistryIBM"
-            id="org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistryIBM">
-      </publicUDDIRegistryType>
-   </extension>
-
-   <extension
-         point="org.eclipse.jst.ws.consumption.ui.publicUDDIRegistryType">
-      <publicUDDIRegistryType
-            name="%PUBLICUDDIREGISTRYTYPE_NAME_MICROSOFT_TEST"
-            class="org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistryMicrosoftTest"
-            id="org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistryMicrosoftTest">
-      </publicUDDIRegistryType>
-   </extension>
-
-   <extension
-         point="org.eclipse.jst.ws.consumption.ui.publicUDDIRegistryType">
-      <publicUDDIRegistryType
-            name="%PUBLICUDDIREGISTRYTYPE_NAME_MICROSOFT"
-            class="org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistryMicrosoft"
-            id="org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistryMicrosoft">
-      </publicUDDIRegistryType>
-   </extension>
-
-   <extension
-         point="org.eclipse.jst.ws.consumption.ui.publicUDDIRegistryType">
-      <publicUDDIRegistryType
-            name="%PUBLICUDDIREGISTRYTYPE_NAME_SAP_TEST"
-            class="org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistrySAPTest"
-            id="org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistrySAPTest">
-      </publicUDDIRegistryType>
-   </extension>
-
-   <extension
-         point="org.eclipse.jst.ws.consumption.ui.publicUDDIRegistryType">
-      <publicUDDIRegistryType
-            name="%PUBLICUDDIREGISTRYTYPE_NAME_SAP"
-            class="org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistrySAP"
-            id="org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistrySAP">
-      </publicUDDIRegistryType>
-   </extension>
-
-   <extension
-         point="org.eclipse.jst.ws.consumption.ui.publicUDDIRegistryType">
-      <publicUDDIRegistryType
-            name="%PUBLICUDDIREGISTRYTYPE_NAME_XMETHODS"
-            class="org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistryXMethods"
-            id="org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistryXMethods">
-      </publicUDDIRegistryType>
-   </extension>
-
-   <extension
-         point="org.eclipse.jst.ws.consumption.ui.publicUDDIRegistryType">
-      <publicUDDIRegistryType
-            name="%PUBLICUDDIREGISTRYTYPE_NAME_NTTCOMM"
-            class="org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistryNTTComm"
-            id="org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistryNTTComm">
-      </publicUDDIRegistryType>
-   </extension>
-
-   <!-- Test Facilities -->
-   
-   <extension
-         point="org.eclipse.jst.ws.consumption.ui.webServiceTest">
-
-      <webServiceTest
-            methodsneeded="true"
-            name="%SAMPLE_TYPE_WEBSERVICES_ID"
-            java="true"
-            codegen="true"
-            class="org.eclipse.jst.ws.internal.consumption.ui.widgets.test.wssample.WebServiceWSSampleExecutable"
-            id="org.eclipse.jst.ws.internal.consumption.ui.widgets.test.WebServiceSampleTest">
-      </webServiceTest>
-
-      <webServiceTest
-            methodsneeded="false"
-            name="%WSEXPLORER_ID"
-            java="false"
-            codegen="false"
-            class="org.eclipse.jst.ws.internal.consumption.ui.widgets.test.explorer.WebServiceExplorerExecutable"
-            id="org.eclipse.jst.ws.internal.consumption.ui.widgets.test.explorer.WebServiceExplorerExecutable">
-      </webServiceTest>
-
-   </extension>
-
-   <!-- Java Beans -->
-
-   <extension
-         point="org.eclipse.jst.ws.consumption.ui.webServiceServerRuntimeType">
-
-      <webServiceType
-            label="%WEBSERVICETYPE_NAME_JAVA"
-            resourceTypeMetadata="File IResource CompilationUnit"
-            extensionMetadata=".java .class"
-            objectSelectionWidget="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.JavaBeanSelectionWidget"
-            includeNatures="org.eclipse.jst.j2ee.web.WebNature"
-            excludeNatures=""
-            id="org.eclipse.jst.ws.type.java">
-      </webServiceType>
-
-      <webServiceType
-            label="%WEBSERVICETYPE_NAME_WSDL"
-            resourceTypeMetadata="File IResource String ServiceImpl ServiceRefImpl WSDLResourceImpl"
-            extensionMetadata=".wsdl .wsil .html .ServiceImpl .ServiceRefImpl .WSDLResourceImpl"
-            objectSelectionWidget="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.WSDLSelectionWidget"
-            includeNatures="org.eclipse.jst.j2ee.web.WebNature"
-            excludeNatures=""            
-            id="org.eclipse.jst.ws.type.wsdl">
-      </webServiceType>
-
-   </extension>
-
-   <!-- Dynamic Wizards -->
-
-   <extension
-         point="org.eclipse.ui.newWizards">
-      <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.internal.consumption.ui.wizard.client.clientwizard">
-         <description>
-               %PLUGIN_NEW_WIZARD_DESC_WS_CLIENT
-         </description>
-         <selection
-               class="org.eclipse.core.resources.IResource">
-         </selection>
-      </wizard>
-   </extension>
-
-   <extension
-         point="org.eclipse.wst.command.env.dynamicWizard">
-      <dynamicWizard
-            iconbanner="icons/full/wizban/webservicesclient_wiz.gif"
-            class="org.eclipse.jst.ws.internal.consumption.ui.widgets.binding.ClientWidgetBinding"
-            title="%WIZARD_TITLE_WSC"
-            id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard">
-      </dynamicWizard>
-   </extension>
-
-   <extension
-         point="org.eclipse.wst.command.env.dynamicWizard">
-      <dynamicWizard
-            iconbanner="icons/gen_sample_wiz.gif"
-            class="org.eclipse.jst.ws.internal.consumption.ui.widgets.binding.GenSampleWidgetBinding"
-            title="%WIZARD_TITLE_WSC"
-            id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.gensamplewizard">
-      </dynamicWizard>
-   </extension>
-
-   <extension
-         point="org.eclipse.wst.command.env.dynamicWizard">
-      <dynamicWizard
-            iconbanner="icons/config_handler_wiz.gif"
-            class="org.eclipse.jst.ws.internal.consumption.ui.widgets.binding.ConfigServiceHandlersWidgetBinding"
-            title="%LABEL_HANDLERS_CONFIG"
-            id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.service">
-      </dynamicWizard>
-   </extension>
-
-   <extension
-         point="org.eclipse.wst.command.env.dynamicWizard">
-      <dynamicWizard
-            iconbanner="icons/config_handler_wiz.gif"
-            class="org.eclipse.jst.ws.internal.consumption.ui.widgets.binding.ConfigClientHandlersWidgetBinding"
-            title="%LABEL_HANDLERS_CONFIG"
-            id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.client">
-      </dynamicWizard>
-   </extension>
-
-   <extension
-         point="org.eclipse.wst.command.env.dynamicWizard">
-      <dynamicWizard
-            iconbanner="icons/config_handler_wiz.gif"
-            class="org.eclipse.jst.ws.internal.consumption.ui.widgets.binding.ConfigureHandlersWidgetBinding"
-            title="%LABEL_HANDLERS_CONFIG"
-            id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers">
-      </dynamicWizard>
-   </extension>   
-
-   <extension
-         point="org.eclipse.ui.importWizards">
-      <wizard
-            name="%PLUGIN_IMPORT_WIZARD_NAME_WS"
-            icon="icons/import_ws.gif"
-            class="org.eclipse.wst.command.env.ui.widgets.DynamicWizard"
-            id="wsimport">
-         <description>
-               %PLUGIN_IMPORT_WIZARD_DESC_WS
-         </description>
-      </wizard>
-   </extension>
-
-   <extension
-         point="org.eclipse.wst.command.env.dynamicWizard">
-      <dynamicWizard
-            iconbanner="icons/import_ws_wiz.gif"
-            name="%PLUGIN_IMPORT_WIZARD_NAME_WS"
-            class="org.eclipse.jst.ws.internal.consumption.ui.widgets.binding.ImportWSWidgetBinding"
-            id="wsimport">
-      </dynamicWizard>
-   </extension>
-
-   <extension
-         point="org.eclipse.ui.importWizards">
-      <wizard
-            name="%IMPORT_WIZARD_NAME_WSIL"
-            icon="icons/wsil/import_wsil.gif"
-            class="org.eclipse.wst.command.env.ui.widgets.DynamicWizard"
-            id="wsilimport">
-         <description>
-               %IMPORT_WIZARD_DESC_WSIL
-         </description>
-      </wizard>
-   </extension>
-
-   <extension
-         point="org.eclipse.wst.command.env.dynamicWizard">
-      <dynamicWizard
-            iconbanner="icons/wsil/import_wiz_banner_wsil.gif"
-            name="%IMPORT_WIZARD_NAME_WSIL"
-            class="org.eclipse.jst.ws.internal.consumption.ui.widgets.binding.ImportWSILWidgetBinding"
-            id="wsilimport">
-      </dynamicWizard>
-   </extension>
-
-   <!-- Preference Pages -->
-
-   <extension
-         point="org.eclipse.ui.preferencePages">
-
-      <page
-            name="%PREFERENCE_CATEGORY_SERVER_RUNTIME"
-            category="org.eclipse.wst.ws.internal.ui.preferences.name"
-            class="org.eclipse.jst.ws.internal.consumption.ui.preferences.ServerRuntimePreferencePage"
-            id="org.eclipse.jst.ws.internal.consumption.ui.preferences.ServerRuntimePreferencePage">            
-      </page>
-      
-      <page
-            name="%PREFERENCE_CATEGORY_DIALOGS"
-            category="org.eclipse.wst.ws.internal.ui.preferences.name"
-            class="org.eclipse.wst.command.internal.env.ui.preferences.ActionDialogsPreferencePage"
-            id="org.eclipse.jst.wss.popup.category">
-      </page>
-
-      <page
-            name="%PREFERENCE_CATEGORY_TEST_FACILITY"
-            category="org.eclipse.wst.ws.internal.ui.preferences.name"
-            class="org.eclipse.jst.ws.internal.ui.preferences.ScenarioDefaultsPreferencePage"
-            id="org.eclipse.jst.ws.internal.ui.preferences.ScenarioDefaultsPreferencePage">
-      </page>
-
-      <page
-            name="%PREFERENCE_CATEGORY_PROJECT_TOPOLOGY"
-            category="org.eclipse.wst.ws.internal.ui.preferences.name"
-            class="org.eclipse.jst.ws.internal.ui.preferences.ProjectTopologyPreferencePage"
-            id="org.eclipse.jst.ws.internal.ui.preferences.ProjectTopologyPreferencePage">
-      </page>
-      
-   </extension>
-
-   <!-- Main Menu Actions -->
-
-   <extension point="org.eclipse.ui.actionSets">
-
-      <actionSet
-            label="%COMMAND_LAUNCH_WS_EXPLORER"
-            visible="true"
-            id="org.eclipse.jst.ws.consumption">
-         <menu
-               label="%MENU_RUN"
-               path="additions"
-               id="org.eclipse.ui.run">
-            <separator name="explorer">
-            </separator>
-         </menu>
-         <action
-               label="%COMMAND_LAUNCH_WS_EXPLORER"
-               icon="icons/registry.gif"
-               tooltip="%TOOLTIP_LAUNCH_WS_EXPLORER"
-               class="org.eclipse.jst.ws.internal.consumption.ui.action.LaunchWSEAction"
-               menubarPath="org.eclipse.ui.run/explorer"
-               toolbarPath="additions"
-               id="org.eclipse.jst.ws.internal.consumption.ui.action.LaunchWSEAction">
-        </action>
-     </actionSet>
-
-   </extension>
-
-   <!-- "Don't Show Me" Extensions -->
-
-   <extension
-         point="org.eclipse.wst.command.env.actionDialogPreferenceType">
-
-      <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.internal.consumption.ui.wizard.client.clientwizard">
-      </actionDialogPreferenceType>
-
-      <actionDialogPreferenceType
-            name="%CHECKBOX_SHOW_PROXY2SAMPLE_DIALOG"
-            category="org.eclipse.jst.wss.popup.category"
-            tooltip="%TOOLTIP_PPAD_CHECKBOX_PROXY2SAMPLE"
-            infopop="org.eclipse.jst.ws.consumption.ui.PPAD0005"
-            id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.gensamplewizard">
-      </actionDialogPreferenceType>
-
-      <actionDialogPreferenceType
-            showcheckbox="false"
-            alwayshide="false"
-            id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.genwsil">
-      </actionDialogPreferenceType>
-
-      <actionDialogPreferenceType
-            showcheckbox="false"
-            alwayshide="false"
-            id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.editor">
-      </actionDialogPreferenceType>
-
-   </extension>
-
-   <!-- Popups -->
-
-   <extension
-         point="org.eclipse.ui.popupMenus">
-
-      <objectContribution
-            objectClass="org.eclipse.core.resources.IFile"
-            nameFilter="*.wsdl"
-            id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.genwsil">
-         <action
-               label="%POPUP_GENERATE_WSIL"
-               class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-               menubarPath="org.eclipse.jst.ws.atk.ui.webservice.category.popupMenu/popupActions"
-               id="wsilimport">
-         </action>
-      </objectContribution>
-
-      <objectContribution
-            objectClass="org.eclipse.core.resources.IFile"
-            nameFilter="*.wsdl"
-            id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard">
-         <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.internal.consumption.ui.wizard.client.clientwizard">
-         </action>
-      </objectContribution>
-
-      <objectContribution
-            objectClass="org.eclipse.core.resources.IFile"
-            nameFilter="*.wsil"
-            id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard">
-         <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.internal.consumption.ui.wizard.client.clientwizard">
-         </action>
-      </objectContribution>
-
-      <objectContribution
-            objectClass="org.eclipse.core.resources.IFile"
-            nameFilter="*.java"
-            id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.gensamplewizard">
-         <action
-               label="%ACTION_GEN_SAMPLE"
-               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.internal.consumption.ui.wizard.client.gensamplewizard">
-         </action>
-      </objectContribution>
-
-      <objectContribution
-            objectClass="org.eclipse.jdt.internal.core.CompilationUnit"
-            nameFilter="*.java"
-            id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.gensamplewizard">
-         <action
-               label="%ACTION_GEN_SAMPLE"
-               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.internal.consumption.ui.wizard.client.gensamplewizard">
-         </action>
-      </objectContribution>
-
-      <objectContribution
-            objectClass="org.eclipse.wst.wsdl.Service"
-            nameFilter="*"
-            id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard">
-         <action
-               label="%ACTION_GENERATE_JAVA_PROXY"
-               class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-               menubarPath="additions"
-               id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard">
-         </action>
-      </objectContribution>
-
-      <objectContribution
-            objectClass="org.eclipse.wst.wsdl.Service"
-            nameFilter="*"
-            id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.genwsil">
-         <action
-               label="%POPUP_GENERATE_WSIL"
-               class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-               menubarPath="additions"
-               id="wsilimport">
-         </action>
-      </objectContribution>
-
-      <objectContribution
-            objectClass="org.eclipse.core.resources.IFile"
-            nameFilter="webservices.xml"
-            id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.editor">
-         <action
-               label="%POPUP_ADD_HANDLERS"
-               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.internal.consumption.ui.wizard.handlers.service">
-         </action>
-      </objectContribution>
-
-      <objectContribution
-            objectClass="org.eclipse.wst.wsdl.Service"
-            nameFilter="*"
-            id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.editor">
-         <action
-               label="%POPUP_ADD_HANDLERS"
-               class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-               menubarPath="additions"
-               id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.service">
-         </action>
-      </objectContribution>   
-
-      <objectContribution
-            objectClass="org.eclipse.jst.j2ee.internal.webservice.WebServiceNavigatorGroupType"
-            id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.editor">
-         <action
-               label="%POPUP_ADD_HANDLERS"
-               class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-               menubarPath="additions"
-               id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers">
-         </action>
-         <visibility>
-			<objectState
-                  name="type"
-                  value="Handlers">
-            </objectState>
-         </visibility>
-      </objectContribution>     
-
-      <objectContribution
-            objectClass="org.eclipse.wst.wsdl.util.WSDLResourceImpl"
-            nameFilter="*"
-            id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.editor">
-         <action
-               label="%POPUP_ADD_HANDLERS"
-               class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-               menubarPath="additions"
-               id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.service">
-         </action>
-      </objectContribution>            
-
-      <objectContribution
-            objectClass="org.eclipse.core.resources.IFile"
-            nameFilter="webservicesclient.xml"
-            id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.editor">
-         <action
-               label="%POPUP_ADD_HANDLERS"
-               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.internal.consumption.ui.wizard.handlers.client">
-         </action>
-      </objectContribution>
-
-      <objectContribution
-            objectClass="org.eclipse.core.resources.IFile"
-            nameFilter="ejb-jar.xml"
-            id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.editor">
-         <action
-               label="%POPUP_ADD_HANDLERS"
-               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.internal.consumption.ui.wizard.handlers.client">
-         </action>
-      </objectContribution>    
-
-      <objectContribution
-            objectClass="org.eclipse.core.resources.IFile"
-            nameFilter="web.xml"
-            id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.editor">
-         <action
-               label="%POPUP_ADD_HANDLERS"
-               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.internal.consumption.ui.wizard.handlers.client">
-         </action>
-      </objectContribution>  
-
-      <objectContribution
-            objectClass="org.eclipse.core.resources.IFile"
-            nameFilter="application-client.xml"
-            id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.editor">
-         <action
-               label="%POPUP_ADD_HANDLERS"
-               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.internal.consumption.ui.wizard.handlers.client">
-         </action>
-      </objectContribution> 
-
-      <objectContribution
-            objectClass="org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef"
-            nameFilter="*"
-            id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.editor">
-         <action
-               label="%POPUP_ADD_HANDLERS"
-               class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-               menubarPath="additions"
-               id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.client">
-         </action>
-      </objectContribution>      
-      
-      <objectContribution
-            objectClass="org.eclipse.wst.wsdl.util.WSDLResourceImpl"
-            nameFilter="*"
-            id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard">
-         <action
-               label="%ACTION_GENERATE_JAVA_PROXY"
-               class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-               menubarPath="additions"
-               id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard">
-         </action>
-      </objectContribution>
-
-      <objectContribution
-            objectClass="org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef"
-            nameFilter="*"
-            id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard">
-         <action
-               label="%ACTION_GENERATE_JAVA_PROXY"
-               class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-               menubarPath="additions"
-               id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard">
-         </action>
-      </objectContribution>
-
-      <objectContribution
-            objectClass="org.eclipse.wst.wsdl.util.WSDLResourceImpl"
-            nameFilter="*"
-            id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.genwsil">
-         <action
-               label="%POPUP_GENERATE_WSIL"
-               class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-               menubarPath="additions"
-               id="wsilimport">
-         </action>
-      </objectContribution>
-
-      <objectContribution
-         objectClass="org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef"
-         nameFilter="*"
-         id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.genwsil">
-         <action
-            label="%POPUP_GENERATE_WSIL"
-            class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-            menubarPath="additions"
-            id="wsilimport">
-         </action>
-      </objectContribution>
-
-   </extension>
-
-   <!-- Client Project Types -->
-
-   <extension
-         point="org.eclipse.jst.ws.consumption.ui.clientProjectType">
-      <clientProjectType
-            include="org.eclipse.jst.j2ee.web.WebNature"
-            exclude=""
-            label="%LABEL_CLIENT_TYPE_WEB"
-            id="org.eclipse.jst.ws.consumption.ui.clientProjectType.Web">
-      </clientProjectType>
-   </extension>
-
-   <extension
-         point="org.eclipse.jst.ws.consumption.ui.clientProjectType">
-      <clientProjectType
-            include="org.eclipse.jdt.core.javanature"
-            exclude="org.eclipse.jst.j2ee.web.WebNature org.eclipse.jst.j2ee.ejb.EJBNature org.eclipse.jst.j2ee.ApplicationClientNature"
-            label="%LABEL_CLIENT_TYPE_CONTAINERLESS"
-            id="org.eclipse.jst.ws.consumption.ui.clientProjectType.Containerless">
-      </clientProjectType>
-   </extension>
-
-   <extension
-         point="org.eclipse.jst.ws.consumption.ui.clientProjectType">
-      <clientProjectType
-            include="org.eclipse.jst.j2ee.ejb.EJBNature"
-            exclude=""
-            label="%LABEL_CLIENT_TYPE_EJB"
-            id="org.eclipse.jst.ws.consumption.ui.clientProjectType.EJB">
-      </clientProjectType>
-   </extension>
-
-   <extension
-         point="org.eclipse.jst.ws.consumption.ui.clientProjectType">
-      <clientProjectType
-            include="org.eclipse.jst.j2ee.ApplicationClientNature"
-            exclude=""
-            label="%LABEL_CLIENT_TYPE_APP_CLIENT"
-            id="org.eclipse.jst.ws.consumption.ui.clientProjectType.AppClient">
-      </clientProjectType>
-   </extension>
-
-   <!-- Object Selection Widgets -->
-
-   <extension
-         point="org.eclipse.jst.ws.consumption.ui.objectSelectionWidget">
-      <objectSelectionWidget
-            class="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.JavaBeanSelectionWidget"
-            transformer="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.JavaBeanSelectionTransformer"
-            id="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.JavaBeanSelectionWidget">
-      </objectSelectionWidget>
-   </extension>
-
-   <extension
-         point="org.eclipse.jst.ws.consumption.ui.objectSelectionWidget">
-      <objectSelectionWidget
-            class="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.EJBSelectionWidget"
-            id="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.EJBSelectionWidget">
-      </objectSelectionWidget>
-   </extension>
-
-   <extension
-         point="org.eclipse.jst.ws.consumption.ui.objectSelectionWidget">
-      <objectSelectionWidget
-            class="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.WSDLSelectionWidget"
-            transformer="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.WSDLSelectionTransformer"
-            id="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.WSDLSelectionWidget">
-      </objectSelectionWidget>
-   </extension>
-   
-   <!-- New extension points for WTP M4 -->
-   <extension-point id="discovery" name="UI Browsers for implementation artifacts"/>      
-   <extension-point id="wsImpl" name="Web service implementations"/>
-   <extension-point id="wsClientImpl" name="Web service client implementations"/>
-   <extension-point id="serviceType" name="Extensions that provide unique combinations of service implementations, scenarios, and module types "/>
-   <extension-point id="clientType" name="Extensions that provide unique combinations of client implementations and module types"/>
-   <extension-point id="webServiceRuntime" name="Web service runtimes"/>
-   <extension-point id="tester" name="Web service test facilities"/>
-   <extension-point id="publisher" name="Web service publication facilities"/>      
-
-<!-- M4 Extensions to the new extension points -->
-<extension point="org.eclipse.jst.ws.consumption.ui.wsImpl">
-  <webServiceImpl
-            id="org.eclipse.jst.ws.wsImpl.java"
-            label="%WEBSERVICETYPE_NAME_JAVA"
-            resourceTypeMetadata="File IResource CompilationUnit"
-            extensionMetadata=".java .class">
-  </webServiceImpl>
-</extension>   
-<extension point="org.eclipse.jst.ws.consumption.ui.wsClientImpl">
-  <webServiceClientImpl
-            id="org.eclipse.jst.ws.wsClientImpl.java"
-            label="Java Proxy">
-  </webServiceClientImpl>
-</extension>   
-<extension point="org.eclipse.jst.ws.consumption.ui.serviceType">
-  <serviceType
-            id="org.eclipse.jst.ws.serviceType.java"
-            implId="org.eclipse.jst.ws.wsImpl.java"
-            buModuleTypesInclude="org.eclipse.jst.j2ee.web.WebNature"
-            buModuleTypesExclude=""
-            tdModuleTypesInclude="org.eclipse.jst.j2ee.web.WebNature"
-            tdModuleTypesExclude=""
-            webServiceTypeId="org.eclipse.jst.ws.type.java">
-  </serviceType>
-</extension>   
-<extension point="org.eclipse.jst.ws.consumption.ui.serviceType">
-  <serviceType
-            id="org.eclipse.jst.ws.serviceType.wsdl"
-            implId="org.eclipse.jst.ws.wsImpl.java"
-            buModuleTypesInclude="org.eclipse.jst.j2ee.web.WebNature"
-            buModuleTypesExclude=""
-            tdModuleTypesInclude="org.eclipse.jst.j2ee.web.WebNature"
-            tdModuleTypesExclude=""
-            webServiceTypeId="org.eclipse.jst.ws.type.wsdl">
-  </serviceType>
-</extension>
-<extension point="org.eclipse.jst.ws.consumption.ui.clientType">
-  <clientType
-            id="org.eclipse.jst.ws.clientType.java.webOnly"
-            implId="org.eclipse.jst.ws.wsClientImpl.java"
-            moduleTypesInclude="org.eclipse.jst.ws.consumption.ui.clientProjectType.Web"
-			moduleTypesExclude=""
-            webServiceClientTypeId="org.eclipse.jst.ws.client.type.java">
-  </clientType>
-</extension>
-<extension point="org.eclipse.jst.ws.consumption.ui.webServiceRuntime">
-  <webServiceRuntime
-    id="org.eclipse.jst.ws.dummyRT"
-    label="Dummy"
-    serviceTypes="org.eclipse.jst.ws.serviceType.java org.eclipse.jst.ws.serviceType.wsdl"
-    clientTypes="org.eclipse.jst.ws.clientType.java.webOnly"
-    servletLevels="23 24"
-    j2eeLevels="13 14"
-    servers="org.eclipse.jst.server.tomcat.40 org.eclipse.jst.server.tomcat.41 org.eclipse.jst.server.tomcat.50"
-    class="org.eclipse.jst.ws.internal.dummy.DummyWebServiceRuntime">
-  </webServiceRuntime>
-</extension>   
-
-<extension point="org.eclipse.jst.ws.consumption.ui.webServiceRuntime">
-  <webServiceRuntime
-    id="org.eclipse.jst.ws.barneyRT"
-    label="Barney Rubble"
-    serviceTypes="org.eclipse.jst.ws.serviceType.java"
-    clientTypes="org.eclipse.jst.ws.clientType.java.webOnly"
-    servletLevels="24"
-    j2eeLevels="14"
-    servers="org.eclipse.jst.server.tomcat.40 org.eclipse.jst.server.tomcat.41 org.eclipse.jst.server.tomcat.50"
-    class="org.eclipse.jst.ws.internal.barney.BarneyWebServiceRuntime">
-  </webServiceRuntime>
-</extension>   
-
-    <extension point="org.eclipse.wst.command.env.ui.widgetRegistry">
-       <widgetFactory   
-             id="DummyId1"
-             insertBeforeCommandId="org.eclipse.jst.ws.internal.dummy.DummyWebService$TestCommand3"
-             class="org.eclipse.jst.ws.internal.dummy.DummyWidgetFactory2"/>
-    </extension>
-    
-    <extension point="org.eclipse.wst.command.env.ui.widgetRegistry">
-       <widgetFactory   
-             id="DummyId2"
-             insertBeforeCommandId="org.eclipse.jst.ws.internal.dummy.DummyWebService$TestCommand2"
-             class="org.eclipse.jst.ws.internal.dummy.DummyWidgetFactory"/>
-    </extension>
-    
-    <extension point="org.eclipse.wst.command.env.ui.widgetRegistry">
-       <widgetFactory   
-             id="DummyId3"
-             insertBeforeCommandId="org.eclipse.jst.ws.internal.dummy.DummyWebServiceClient$TestCommand4"
-             class="org.eclipse.jst.ws.internal.dummy.DummyWidgetFactory2"/>
-    </extension>
-    
-    <extension point="org.eclipse.wst.command.env.ui.widgetRegistry">
-       <widgetFactory   
-             id="DummyId4"
-             insertBeforeCommandId="org.eclipse.jst.ws.internal.dummy.DummyWebServiceClient$TestCommand5"
-             class="org.eclipse.jst.ws.internal.dummy.DummyWidgetFactory"/>
-    </extension>        
-    
-    <extension point="org.eclipse.wst.command.env.ui.widgetRegistry">
-       <widgetFactory   
-             id="BarneyId1"
-             insertBeforeCommandId="org.eclipse.jst.ws.internal.barney.BarneyWebService$TestCommand1"
-             class="org.eclipse.jst.ws.internal.barney.BarneyWidgetFactory"/>
-    </extension> 
-    
-    <extension point="org.eclipse.wst.command.env.ui.widgetRegistry">
-       <widgetFactory   
-             id="BarneyId2"
-             insertBeforeCommandId="org.eclipse.jst.ws.internal.barney.BarneyWebService$TestCommand6"
-             class="org.eclipse.jst.ws.internal.barney.BarneyWidgetFactory2"/>
-    </extension>     
-</plugin>
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/schema/clientProjectType.exsd b/bundles/org.eclipse.jst.ws.consumption.ui/schema/clientProjectType.exsd
deleted file mode 100644
index 6995213..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/schema/clientProjectType.exsd
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.ws.consumption.ui">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.jst.ws.consumption.ui" id="clientProjectType" name="clientProjectType"/>
-      </appInfo>
-      <documentation>
-         [Enter description of this extension point.]
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <annotation>
-         <documentation>
-            This extension point defines client container types.
-         </documentation>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="clientProjectType" minOccurs="1" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The point attribute string must be org.eclipse.jst.ws.consumption.ui.clientProjectType.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="clientProjectType">
-      <complexType>
-         <attribute name="include" type="string" use="required">
-            <annotation>
-               <documentation>
-                  This attribute contains a blank delimited list of Project Nature Ids.  The listed IDs indicate that this type only works with these particular project types.  For example, if this type only works with web projects an ID of org.eclipse.jst.j2ee.web.WebNature would be specified.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="exclude" type="string" use="required">
-            <annotation>
-               <documentation>
-                  This attribute contains a blank delimited list of Project Nature Ids.  The listed IDs indicate that this type DOES NOT work with these particular project types.  For example, if this type does not work with web projects an ID of org.eclipse.jst.j2ee.web.WebNature would be specified.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="label" type="string" use="required">
-            <annotation>
-               <documentation>
-                  This label represents this client project type.  It is displayed to the user so it must be translated.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  A unique identifier for this client project type.  This identifier is referenced in the clientProjectType attribute of the webServiceClientType element of an org.eclipse.jst.ws.consumption.ui.webServiceClientType extension.
-               </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.jst.ws.consumption.ui/schema/objectSelectionWidget.exsd b/bundles/org.eclipse.jst.ws.consumption.ui/schema/objectSelectionWidget.exsd
deleted file mode 100644
index c556fd2..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/schema/objectSelectionWidget.exsd
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.ws.consumption.ui">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.jst.ws.consumption.ui" id="objectSelectionWidget" name="objectSelectionWidget"/>
-      </appInfo>
-      <documentation>
-         [Enter description of this extension point.]
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="objectSelectionWidget" minOccurs="1" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The point attribute string must be org.eclipse.jst.ws.consumption.ui.objectSelectionWidget.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="objectSelectionWidget">
-      <annotation>
-         <documentation>
-            This extension point entry allows an extender to add new ways of browsing/finding artifacts that can be used to create Web services.
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  This class defines Selection Widget to be displayed on the Object Selection page of the Web services wizards.  This class must implement the org.eclipse.jst.ws.consumption.ui.widgets.object.IObjectSelectionWidget interface.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  This id uniquely identifies this objectSelectionWidget element.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="transformer" type="string">
-            <annotation>
-               <documentation>
-                  This attribute specifies a class that must implement the org.eclipse.wst.command.env.core.data.Transformer interface.  This interface contains a transform method.  Even though the type of the input parameter and the return value are of type Object it is expected that they will be used with the type org.eclipse.jface.viewers.IStructuredSelection.  This transformation method allows the extender to modify the initial selection to an IStructuredSelection object that is more readily usable by the runtime server type.
-               </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.jst.ws.consumption.ui/schema/webServiceClientType.exsd b/bundles/org.eclipse.jst.ws.consumption.ui/schema/webServiceClientType.exsd
deleted file mode 100644
index 3bbe2f2..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/schema/webServiceClientType.exsd
+++ /dev/null
@@ -1,201 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.ws.consumption.ui">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="" id="webServiceClientType" name="Web Service Client Types"/>
-      </appInfo>
-      <documentation>
-         This extension point defines Web Service Client types.  This is done by defining webServiceClientType elements.  These elements refer to a server and a Web Service runtime.  These are respectively defined in the webServiceServer element and the webServiceRuntime element.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="webServiceServer" minOccurs="1" maxOccurs="unbounded"/>
-            <element ref="webServiceRuntime" minOccurs="1" maxOccurs="unbounded"/>
-            <element ref="webServiceClientType" minOccurs="1" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The point attribute string must be org.eclipse.jst.ws.consumption.ui.webServiceClientType.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="webServiceServer">
-      <annotation>
-         <documentation>
-            This element specifies information about a particular server type.
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="factoryId" type="string" use="required">
-            <annotation>
-               <documentation>
-                  This is the factory id for a server.  This id is defined by
-the org.eclipse.wst.server.core.serverTypes extension point.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="isDefault" type="boolean" use="required">
-            <annotation>
-               <documentation>
-                  This parameter indicates if this server should be used as the default server.  Note:  this default parameter is only used in the absence of other information.  If the user has defined a particular server as their default then this parameter is ignored.  Should contain a value of either &quot;true&quot; or &quot;false&quot;.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  This is a local ID for this server.  The server attribute of the webserviceClientType element refers to this ID.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="runtimeTypeIds" type="string">
-            <annotation>
-               <documentation>
-                  This attribute is currently a place holder for future development.  Please, do not use.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="webServiceRuntime">
-      <annotation>
-         <documentation>
-            This element specifies information about a particular Web Services runtime.
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="label" type="string" use="required">
-            <annotation>
-               <documentation>
-                  This label is displayed to the user for this runtime.  Therefore, is must be translated.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="description" type="string">
-            <annotation>
-               <documentation>
-                  A description of this Web Services runtime.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="isDefault" type="boolean" use="required">
-            <annotation>
-               <documentation>
-                  This parameter indicates if this runtime should be used as the default runtime.  Note:  this default parameter is only used in the absence of other information.  If the user has defined a particular runtime as their default then this parameter is ignored.  Should contain a value of either &quot;true&quot; or &quot;false&quot;.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="j2eeversion" type="string" use="required">
-            <annotation>
-               <documentation>
-                  This attribute specifies the J2EE versions supported by this runtime.  The allowable values are 12, 13, and 14.  If more than one J2EE version is supported each J2EE level should be specified with a blank delimiter.(eg. if J2EE version 1.2 and 1.3 are supported then this attribute string would be &quot;12 13&quot;.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="webServiceClientType">
-      <annotation>
-         <documentation>
-            This element specifies information about a particular Web Services client type.
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  This is the ID for this Web Service Client type.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string" use="required">
-            <annotation>
-               <documentation>
-                  This is the name for this Web Service Client type.  It is displayed to the user so it must be translated.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="clientType" type="string" use="required">
-            <annotation>
-               <documentation>
-                  This is the kind of Web Service Client type being defined. (ie. the value of the Java client is org.eclipse.jst.ws.client.type.java.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="runtime" type="string" use="required">
-            <annotation>
-               <documentation>
-                  This is the runtime ID for this Web Service client type.  There should be a corresponding webServiceRuntime element with an attribute called id that has this value.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="server" type="string" use="required">
-            <annotation>
-               <documentation>
-                  This attribute specifies the server for this Web Service client type.  There should be a corresponding webServiceServer element with an attribute called id that has this value.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="clientProjectType" type="string" use="default" value="org.eclipse.jst.ws.consumption.ui.clientProjectType.Web">
-            <annotation>
-               <documentation>
-                  This attribute contains a space delimited list of client project type ids supported by this by this webServiceClientType element.  The client project type ids are defined by the org.eclipse.jst.ws.consumption.ui.clientProjectType extension point.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="developBinding" type="string">
-            <annotation>
-               <documentation>
-                  This attribute specifies a CommandWidgetBinding class.  This class specifies the Commands and UI elements associate with J2EE development phase.  The Command and UI elements in this binding always come first in the wizard.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="assemblyBinding" type="string">
-            <annotation>
-               <documentation>
-                  This attribute specifies a CommandWidgetBinding class.  This class specifies the Commands and UI elements associate with J2EE assembly phase.  The Command and UI elements in this binding always come after the development phase binding in the wizard.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="deployBinding" type="string">
-            <annotation>
-               <documentation>
-                  This attribute specifies a CommandWidgetBinding class.  This class specifies the Commands and UI elements associate with J2EE deploy phase.  The Command and UI elements in this binding always come after the assembly phase binding in the wizard.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="installBinding" type="string">
-            <annotation>
-               <documentation>
-                  This attribute specifies a CommandWidgetBinding class.  This class specifies the Commands and UI elements associate with J2EE install phase.  The Command and UI elements in this binding always come after the deploy phase binding in the wizard.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-</schema>
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/schema/webServiceServerRuntimeType.exsd b/bundles/org.eclipse.jst.ws.consumption.ui/schema/webServiceServerRuntimeType.exsd
deleted file mode 100644
index ec44bca..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/schema/webServiceServerRuntimeType.exsd
+++ /dev/null
@@ -1,269 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.ws.consumption.ui">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.jst.ws.consumption.ui" id="webServiceServerRuntimeType" name="Web Service Server Runtime Types"/>
-      </appInfo>
-      <documentation>
-         This extension point defines Web Service Server types.  This is done by defining webServiceServerRuntimeType elements.  These elements refer to a server and a Web Service runtime.  These are respectively defined in the webServiceServer element and the webServiceRuntime element.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="webServiceServer" minOccurs="1" maxOccurs="unbounded"/>
-            <element ref="webServiceRuntime" minOccurs="1" maxOccurs="unbounded"/>
-            <element ref="webServiceServerRuntimeType" minOccurs="1" maxOccurs="unbounded"/>
-            <element ref="webServiceType" minOccurs="1" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The point attribute string must be org.eclipse.jst.ws.consumption.ui.webServiceServerRuntimeType.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="webServiceServer">
-      <annotation>
-         <documentation>
-            This element specifies information about a particular server type.
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="factoryId" type="string" use="required">
-            <annotation>
-               <documentation>
-                  This is the factory id for a server.  This id is defined by
-the org.eclipse.wst.server.core.serverTypes extension point.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="isDefault" type="boolean" use="required">
-            <annotation>
-               <documentation>
-                  This parameter indicates if this server should be used as the default server.  Note:  this default parameter is only used in the absence of other information.  If the user has defined a particular server as their default then this parameter is ignored.  Should contain a value of either &quot;true&quot; or &quot;false&quot;.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  This is a local ID for this server.  The server attribute of the webserviceServerRuntimeType element refers to this ID.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="runtimeTypeIds" type="string">
-            <annotation>
-               <documentation>
-                  This attribute is currently a place holder for future development.  Please, do not use.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="webServiceRuntime">
-      <annotation>
-         <documentation>
-            This element specifies information about a particular Web Services runtime.
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="label" type="string" use="required">
-            <annotation>
-               <documentation>
-                  This label is displayed to the user for this runtime.  Therefore, is must be translated.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="description" type="string">
-            <annotation>
-               <documentation>
-                  A description of this Web Services runtime.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="isDefault" type="boolean" use="required">
-            <annotation>
-               <documentation>
-                  This parameter indicates if this runtime should be used as the default runtime.  Note:  this default parameter is only used in the absence of other information.  If the user has defined a particular runtime as their default then this parameter is ignored.  Should contain a value of either &quot;true&quot; or &quot;false&quot;.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="j2eeversion" type="string" use="required">
-            <annotation>
-               <documentation>
-                  This attribute specifies the J2EE versions supported by this runtime.  The allowable values are 12, 13, and 14.  If more than one J2EE version is supported each J2EE level should be specified with a blank delimiter.(eg. if J2EE version 1.2 and 1.3 are supported then this attribute string would be &quot;12 13&quot;.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="webServiceServerRuntimeType">
-      <annotation>
-         <documentation>
-            This element specifies information about a particular Web Services server runtime type.  An entry for this element defines a valid combination of server, runtime, and webservice type.
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  This is the ID for this Web Service Server Runtime type.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string" use="required">
-            <annotation>
-               <documentation>
-                  This is the name for this Web Service Server Runtime type.  It is displayed to the user so it must be translated.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="runtime" type="string" use="required">
-            <annotation>
-               <documentation>
-                  This is the runtime ID for this Web Service Server Runtime type.  There should be a corresponding webServiceRuntime element with an attribute called id that has this value.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="server" type="string" use="required">
-            <annotation>
-               <documentation>
-                  This attribute specifies the server for this Web Service Server Runtime type.  There should be a corresponding webServiceServer element with an attribute called id that has this value.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="type" type="string" use="required">
-            <annotation>
-               <documentation>
-                  This is the kind of Web Service Runtime type being defined. (eg. the value of a Java Bean Webservice is org.eclipse.jst.ws.type.java)
-There should be a corresponding webServiceType element with an attribute called id that has this value.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="developBinding" type="string">
-            <annotation>
-               <documentation>
-                  This attribute specifies a CommandWidgetBinding class.  This class specifies the Commands and UI elements associate with J2EE development phase.  The Command and UI elements in this binding always come first in the wizard.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="assemblyBinding" type="string">
-            <annotation>
-               <documentation>
-                  This attribute specifies a CommandWidgetBinding class.  This class specifies the Commands and UI elements associate with J2EE assembly phase.  The Command and UI elements in this binding always come after the development phase binding in the wizard.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="deployBinding" type="string">
-            <annotation>
-               <documentation>
-                  This attribute specifies a CommandWidgetBinding class.  This class specifies the Commands and UI elements associate with J2EE deploy phase.  The Command and UI elements in this binding always come after the assembly phase binding in the wizard.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="installBinding" type="string">
-            <annotation>
-               <documentation>
-                  This attribute specifies a CommandWidgetBinding class.  This class specifies the Commands and UI elements associate with J2EE install phase.  The Command and UI elements in this binding always come after the deploy phase binding in the wizard.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="requireEJBModule" type="boolean" use="required">
-            <annotation>
-               <documentation>
-                  If the Webservice for this Server Runtime Type is required to be in an EJB module then the value of this attribute should be true.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="requireWebModule" type="boolean" use="required">
-            <annotation>
-               <documentation>
-                  If the Webservice for this Server Runtime Type is required to be in an Web module then the value of this attribute should be true.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="webServiceType">
-      <annotation>
-         <documentation>
-            This element defines a particular Web service kind.  Such as a Java Bean web service, a Skeleton Web service, an EJB  Web service, etc.
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  This a unique ID for this Web service type.  It is referenced in the webServiceServerRuntimeType element with the type attribute.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="label" type="string" use="required">
-            <annotation>
-               <documentation>
-                  This is a translatable label for this web service type.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="resourceTypeMetadata" type="string" use="required">
-            <annotation>
-               <documentation>
-                  This attribute contains a blank delimited list class Names. (ie.No package prefix)  The classes listed define the allowable Eclipse resources that this web service type understands and turn into a Web service.  For example, if a user selects a Java source file in the package explorer view and then starts the Web services wizard a CompilationUnit object will be passed in as part of an IStructuredSelection.  By putting &quot;CompilationUnit&quot; as one of the classes in this attribute it indicates that this type can create a Web service from the CompilationUnit.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="extensionMetadata" type="string" use="required">
-            <annotation>
-               <documentation>
-                  This attribute allows this Web service type to restrict names of the input files that it understands.  For example, if the value is set to &quot;.java .class&quot; it indicates that this Web service type only understands resource names that end with .java or end with .class.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="objectSelectionWidget" type="string" use="required">
-            <annotation>
-               <documentation>
-                  On page 2 of the Web service wizard there is an Object selection page.  This selection page can be customized using this attribute, since different Web service types may need different methods of selecting them.  The value of this attribute should be the id of a org.eclipse.jst.ws.consumption.ui.objectSelectionWidget extension.  The predefined id for a Java selection widget is org.eclipse.jst.ws.consumption.ui.widgets.object.JavaBeanSelectionWidget.  The predefined id for a WSDL selection widget is org.eclipse.jst.ws.consumption.ui.widgets.object.WSDLSelectionWidget.  The predefined id for an EJB selection widget is org.eclipse.jst.ws.consumption.ui.widgets.object.EJBSelectionWidget.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="includeNatures" type="string" use="required">
-            <annotation>
-               <documentation>
-                  This attribute contains a blank delimited list of Project Nature Ids.  The listed IDs indicate that this type only works with these particular project types.  For example, if this type only works with web projects an ID of org.eclipse.jst.j2ee.web.WebNature would be specified.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="excludeNatures" type="string" use="required">
-            <annotation>
-               <documentation>
-                  This attribute contains a blank delimited list of Project Nature Ids.  The listed IDs indicate that this type DOES NOT work with these particular project types.  For example, if this type does not work with web projects an ID of org.eclipse.jst.j2ee.web.WebNature would be specified.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-</schema>
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/schema/webServiceTest.exsd b/bundles/org.eclipse.jst.ws.consumption.ui/schema/webServiceTest.exsd
deleted file mode 100644
index e462b04..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/schema/webServiceTest.exsd
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.ws.consumption.ui">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.jst.ws.consumption.ui" id="webServiceTest" name="Web Service Test"/>
-      </appInfo>
-      <documentation>
-         [Enter description of this extension point.]
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <annotation>
-         <documentation>
-            This extension point defines Web service test facilities that can be plugged into the Web services wizards.
-         </documentation>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="webServiceTest" minOccurs="1" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The point attribute string must be org.eclipse.jst.ws.consumption.ui.webServiceTest.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="webServiceTest">
-      <complexType>
-         <attribute name="methodsneeded" type="boolean">
-            <annotation>
-               <documentation>
-                  This attribute indicates if this test facility need to methods from a proxy bean.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  The value of this attribute is displayed to the user for this test facility.  It must be translated.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="java" type="boolean">
-            <annotation>
-               <documentation>
-                  This attribute indicates whether this test facility is intended for clients that generate a Java bean as output.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="codegen" type="boolean">
-            <annotation>
-               <documentation>
-                  This attribute indicates if this test facility generates code or not, such as JSP files.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string">
-            <annotation>
-               <documentation>
-                  This attribute contains a class name.  The class must implement org.eclipse.jst.ws.ext.WebServiceExecutable.  This class allows the extender to provide the Commands that will execute for this test facility.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  This is a unique identifier for this test facility.
-               </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.jst.ws.consumption.ui/src/org/eclipse/jst/ws/consumption/ui/plugin.properties b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/consumption/ui/plugin.properties
deleted file mode 100644
index 54ba197..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/consumption/ui/plugin.properties
+++ /dev/null
@@ -1,500 +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_NEW_WIZARD_NAME_WS_CLIENT=Web Service Client
-#
-# Web services "Internet" preferences extension.
-#
-
-#
-# Web Samples IDs
-#
-
-#
-# Pop-up actions
-#
-ACTION_GENERATE_JAVA_PROXY=Generate Client
-
-#
-# Dialogs
-#
-CHECKBOX_SHOW_GENERATE_JAVA_PROXY_DIALOG=Show Generate Java bean Proxy Dialog
-TOOLTIP_PPAD_CHECKBOX_WSDL2PROXY=Show the dialog for generating the Java bean proxy action.
-
-#
-#       Web Services Preferance Pages
-#
-# Categories
-#
-
-#
-# Preferences Tooltips
-#
-
-#
-#Server Runtime Preferences
-#
-TOOLTIP_SRPF_COMBO_SERVER=The preferred server type
-TOOLTIP_SRPF_COMBO_RUNTIME=The preferred Web service runtime
-TOOLTIP_SRPF_COMBO_J2EE=The preferred J2EE version
-
-#
-# Pop-up actions
-#
-
-#
-# General messages.
-#
-MSG_ERROR_TASK_EXCEPTED=IWAB0234E An internal error occurred. Details: {0}
-
-
-
-
-#
-#Runtime labels
-#
-
-
-#
-# Wizard page task labels and descriptions
-# (used only for progress indication).
-#
-
-#
-# Common wizard strings.
-#
-LABEL_FOLDER_NAME=Folder:
-LABEL_JSP_FOLDER_NAME=JSP folder:
-LABEL_WEB_PROJECT_NAME=Web project:
-LABEL_WEBSERVICETYPE=Web service type:
-LABEL_J2EE_VERSION=J2EE version:
-LABEL_NA=N/A
-
-BUTTON_BROWSE=Browse...
-BUTTON_BROWSE_FILES=Browse files...
-BUTTON_USE_ABSOLUTE_LOCATION=Use absolute location URI for WSDL input statements
-BUTTON_USE_INLINE_SCHEMA=Use inline schema
-
-
-
-
-#
-# Wizards.
-#
-WIZARD_TITLE_WSC=Web Service Client
-
-#
-# WebServiceClientSelectionPage
-#
-
-#
-# WebServiceServerSelectionPage
-#
-
-#
-# WebServiceProjectPage
-#
-PAGE_TITLE_WS_PROJECT=Web Services
-PAGE_DESC_WS_PROJECT=Review your Web service options and make any necessary changes before proceeding to the next page.
-BUTTON_START_WEB_PROJECT=Start Web service in Web project
-GROUP_SCENARIO_SERVICE=Service
-GROUP_SCENARIO_CLIENT=Client proxy
-LABEL_WEBSERVICECLIENTTYPE=Client proxy type:
-
-
-
-# Items common to WebServiceRuntimeSelectionPage and WebServiceClientRuntimeSelectionPage
-# WebServiceRuntimeSelectionPage
-PAGE_TITLE_WS_RUNTIME_SELECTION=Service Deployment Configuration
-PAGE_DESC_WS_RUNTIME_SELECTION=Choose from the list of runtime protocols and deployment servers, or use the default settings.
-LABEL_RUNTIMES_LIST=Web service runtime:
-LABEL_SERVERS_LIST=Server:
-LABEL_SERVICE_WEB_MODULE=Service project:
-LABEL_EDIT_BUTTON=Edit...
-LABEL_SERVICE_EAR_PROJECT=EAR project:
-LABEL_EAR_PROJECT=EAR project:
-LABEL_CLIENT_PROJECT=Client project:
-
-TOOLTIP_PWRS_TEXT_RUNTIME=The runtime to be used.
-TOOLTIP_PWRS_TEXT_SERVER=The server to be used.
-TOOLTIP_PWRS_J2EE_VERSION=J2EE version to be used.
-
-LABEL_SELECTION_VIEW_TITLE=Server-Side Deployment Selection:
-LABEL_SELECTION_VIEW_RUNTIME=Choose Web service runtime protocol first
-LABEL_SELECTION_VIEW_SERVER=Choose server first
-LABEL_SELECTION_VIEW_EXPLORE=Explore options
-
-LABEL_TREE_EXISTING_SERVERS=Existing Servers
-LABEL_TREE_SERVER_TYPES=Server Types
-
-MSG_INVALID_SRT_SELECTIONS=This server and runtime combination is not supported.  Choose a different server or runtime to proceed through the Web services wizard.
-MSG_NO_RUNTIME=No runtime specified for the {0} scenario.
-MSG_NO_SERVER=No server specified for the {0} scenario.
-
-MSG_SERVER_TARGET_MISMATCH=The project, {0}, has a server target which is not compatible with the selected server type
-MSG_J2EE_MISMATCH=The project, {0}, has a different J2EE level from the selected J2EE level
-MSG_SERVICE_PROJECT_EMPTY=The service project cannot be empty. Select a service project
-MSG_SERVICE_EAR_EMPTY=The service EAR cannot be empty. Select a service EAR.
-MSG_CLIENT_PROJECT_EMPTY=The client project cannot be empty. Select a client project
-MSG_CLIENT_EAR_EMPTY=The client EAR cannot be empty. Select a client EAR.
-MSG_INVALID_EJB_PROJECT={0} is not an EJB project. Choose an EJB project, or enter a new EJB project name.
-MSG_INVALID_WEB_PROJECT={0} is not a Web project. Choose a Web project, or enter a new Web project name.
-
-MSG_SAME_CLIENT_AND_SERVICE_EARS=Your selected service and client {0} projects are the same.  Proceeding with this configuration may result in runtime errors when invoking the Web service.
-MSG_WRONG_CLIENT_PROJECT_TYPE=The selected client project, {0}, is not a {1} project. Please select a {1} project or enter a new project name.
-MSG_CLIENT_SUB=client
-MSG_SERVICE_SUB=service
-MSG_GENERAL_PROJECT_AND_EAR=Select the {0} project and the EAR project with which you want it to be associated.
-MSG_EAR_PROJECT_WILL_BE_CREATED=If an EAR or project does not exist or is currently unassociated, it will be created and \nassociated as required when you click Next.
-
-MSG_EAR_WILL_BE_ASSOCIATED=The selected {0} project will be associated with the EAR project.
-MSG_PROJECT_WILL_BE_CREATED=The {0} project will be created and associated with the EAR project.
-MSG_EAR_WILL_BE_CREATED=The {0} EAR project will be created and associated with the project.
-MSG_PROJECT_AND_EAR_CREATED=The {0} project and EAR project will be created and associated with one another.
-
-# WebServiceClientRuntimeSelectionPage
-PAGE_TITLE_WS_CLIENT_RUNTIME_SELECTION=Client Environment Configuration
-PAGE_DESC_WS_CLIENT_RUNTIME_SELECTION=Choose from the list of supported runtime protocols and servers for the client environment, or use the default settings.
-
-LABEL_CLIENT_SELECTION_VIEW_TITLE=Client-Side Environment Selection:
-LABEL_CLIENT_TYPE=Client type:
-LABEL_WEB=Web
-LABEL_EJB=EJB
-LABEL_NO_LABEL=
-
-
-#
-# Items common to WebServiceMappingsPage, WebServiceMappingsPage (client), and WebServiceSOAPBindingPage
-#
-PAGE_MSG_VALIDATION_INTERNAL_ERROR=An internal error occurred during page validation. See logs for details.
-
-#
-# WebServiceMappingsPage
-#
-PAGE_TITLE_WS_XML2BEAN=Web Service Skeleton XML to Java Mappings
-PAGE_DESC_N2P_MAPPINGS=Define custom mapping for namespace to package.
-MSG_MAPPING_DUPLICATE_ENTRIES=Duplicate {0} mapped to the same {1}.
-
-
-#
-# The two ITEM_* strings are entries in a list box of mappings.
-# There are two forms, one when the page is in Java-to-XML mode:
-#   <java-bean-name>, <encoding-style>
-# and one when the page is in XML-to-Java mode:
-#   <xml-namespace-uri>:<xml-short-name>, <encoding-style>
-# where:
-#   <java-bean-name> is a fully-qualified Java class name
-#   <xml-namespace-uri> is the namespace of an XML type
-#   <xml-short-name> is the XML type name within the namespace
-#   <encoding-style> is the encoding style (SOAP or Literal XML)
-#
-
-#
-# WebServiceProxyPage
-#
-BUTTON_GENERATE_PROXY=Generate a proxy
-
-#
-# WebServiceSkeletonConfigPage
-#
-PAGE_DESC_WSSKEL_CONFIG=Define a skeleton Java bean as a Web service.
-PAGE_TITLE_WSSKEL_CONFIG=Web Service Skeleton Java Bean Configuration
-TOOLTIP_PBSC_TEXT_SKELETON_FOLDER=Folder for generated Java skeleton.
-TOOLTIP_PBSC_BUTTON_SKELETON_FOLDER_BROWSE=Browse folders.
-LABEL_SKELETON_ROOT_NAME=Skeleton folder:
-
-#
-# WebServiceBeanClassPage
-#
-LABEL_BEAN_CLASS_NAME=Bean:
-PAGE_MSG_BEAN_CANNOT_BE_EMPTY=Please select a Java bean class.
-BUTTON_BROWSE_CLASSES=Browse classes...
-
-
-#
-# WebServiceTestPage
-#
-PAGE_TITLE_WSTEST=Web Service Test Page
-PAGE_DESC_WSTEST=Select a test facility
-LABEL_TEST_TYPES=Test Facility
-CHECKBOX_TEST_WEBSERVICE=Test the Web service
-CHECKBOX_MONITOR_WEBSERVICE=Monitor the Web service
-MSG_ERROR_UNABLE_TO_LAUNCH_WSDL_TEST=An error occurred. Unable to launch WSDL test facility.
-
-#
-# WebServiceExplorerPage
-#
-BUTTON_LAUNCH_SERVICE_TEST=Launch
-
-#
-# WebServiceClientTestPage
-#
-PAGE_TITLE_WS_SAMPLE=Web Service Client Test
-PAGE_DESC_WS_SAMPLE=Do you want to test the generated proxy?
-BUTTON_TEST=Test the generated proxy
-LABEL_TEST_TYPES=Test facility
-BUTTON_RUN_TEST=Run test on server
-LABEL_METHODS=Methods
-MSG_ERROR_JTS_JSP_GEN=IWAB0313E Error encountered while generating the sample.
-LABEL_JSP_PROJECT_NAME=JSP project:
-MSG_ERROR_JTS_PROXY_NOT_COMPILED=IWAB0357E The Generated proxy was not found. WebService sample jsps cannot be generated.
-MSG_ERROR_MALFORMED_URL=IWAB0358E Test client URL is malformed.
-
-#
-# WebServiceISDPage
-#
-
-#
-# WebServiceBeanConfigPage
-#
-
-#
-# WebServiceBeanMethodsPage
-#
-BUTTON_SELECT_ALL=Select All
-BUTTON_DESELECT_ALL=Deselect All
-TOOLTIP_PBME_BUTTON_SELECT_ALL=Select all methods
-TOOLTIP_PBME_BUTTON_DESELECT_ALL=Deselect all methods
-
-#
-# WebServiceEJBConfigPage
-#
-
-#
-# WebServiceWSDLSelectionPage
-#
-PAGE_TITLE_WSDL_SELECTION=Web Service WSDL File Selection
-PAGE_DESC_WSDL_SELECTION=Select a WSDL file.
-
-
-#
-# WebServicePublishPage
-#
-PAGE_TITLE_WS_PUBLISH=Web Service Publication
-PAGE_DESC_WS_PUBLISH=Do you want to publish your Web service?
-PAGE_TITLE_WS_FIND=Find a Web service
-PAGE_DESC_WS_FIND=Do you want to find a Web service?
-BUTTON_WS_PUBLISH=Launch the Web Services Explorer to publish this Web service to a UDDI Registry
-BUTTON_WS_PUBLISH_PRIVATE_UDDI=Launch the Web Services Explorer to publish this Web service to the Unit Test UDDI Registry
-BUTTON_WS_FIND=Launch the Web Services Explorer to find a Web service from a UDDI Registry
-BUTTON_WS_FIND_PRIVATE_UDDI=Launch the Web Services Explorer to find a Web service from the Unit Test UDDI Registry
-LABEL_PUBLIC_UDDI_REGISTRIES=Public UDDI Registry
-
-#
-# EJB UI strings
-#
-LABEL_EJB_BEAN_NAME=EJB bean
-TABLE_TITLE_EJB_BEAN_NAMES=Stateless EJB beans
-TABLE_TITLE_EJB_PROJECT_NAME=EJB project
-LABEL_EAR_PROJECTS=EAR projects
-TOOLTIP_EAR_PROJECTS=Enterprise application projects.
-TOOLTIP_TABLE_BEAN_NAMES=Select an EJB.
-
-#
-# Tooltips for WebServiceWSDLSelectionPage
-#
-TOOLTIP_PWWS_PAGE=
-
-#
-# Tooltips for beans.WebServiceBeanClassPage
-#
-TOOLTIP_PBCL_PAGE=
-TOOLTIP_PBCL_TEXT_BEAN_CLASS=Selected Java bean.
-TOOLTIP_PBCL_BUTTON_BEAN_CLASS_BROWSE=Browse classes.
-TOOLTIP_PBCL_BUTTON_BEAN_RESOURCE_BROWSE=Browse Java files.
-
-
-#
-# Tooltips for beans.WebServiceTestPage
-#
-TOOLTIP_PSTP_COMBOBOX_TEST=Test facilities available to test the service.
-TOOLTIP_PSTP_LAUNCH_BUTTON=Launch the selected test facility.
-
-
-
-
-#
-# Tooltips for WebServiceRuntimeSelectionPage
-#
-TOOLTIP_PWRS_PAGE=
-TOOLTIP_PWRS_LIST_RUNTIMES=Select from the following deployment runtime(s).
-TOOLTIP_PWRS_LIST_SERVERS=Select from application server(s).
-TOOLTIP_PWRS_RADIO_SERVER=Server oriented selection.
-TOOLTIP_PWRS_RADIO_RUNTIME=Runtime protocol oriented selection.
-TOOLTIP_PWRS_RADIO_EXPLORE=Explore combinations.
-TOOLTIP_PWRS_COMBO_PROJECT=Web project.
-
-#
-# Tooltips for WebServiceClientRuntimeSelectionPage
-#
-TOOLTIP_PWCR_COMBO_CLIENT_TYPE=Client type.
-
-
-#
-# Tooltips for WebServiceProjectPage
-#
-TOOLTIP_PWPR_COMBO_TYPE=Web service implementation type.
-TOOLTIP_PWPR_GROUP_SCENARIO_SERVICE=Service defaults for this wizard scenario.
-TOOLTIP_PWPR_CHECKBOX_GENERATE_PROXY=Enable/disable proxy generation for this scenario.
-TOOLTIP_PWPR_CHECKBOX_START_WEB_PROJECT=Start Web service in Web project for this scenario.
-TOOLTIP_PWPR_CHECKBOX_LAUNCH_WS=Launch the Web Services Explorer to publish the Web service in this scenario to a UDDI Registry.
-TOOLTIP_PWPR_CHECKBOX_TEST_SERVICE=Select this to explore the Web service created.
-TOOLTIP_PWPR_CHECKBOX_MONITOR_SERVICE=Select this to monitor the SOAP traffics of this Web service.
-TOOLTIP_PWPR_GROUP_SCENARIO_CLIENT=Client proxy defaults for this wizard scenario.
-TOOLTIP_PWPR_COMBO_CLIENTTYPE=Client proxy selection type.
-
-#
-# Tooltips for WebServicePublishPage
-#
-TOOLTIP_PWPB_PAGE=
-TOOLTIP_PWPB_CHECKBOX_WS_LAUNCH=Publish the Web service.
-
-
-#
-# WSIL proxy
-#
-
-PAGE_WSIL_IMPORT=WSIL Import Page
-TITLE_WSIL_IMPORT=WSIL Import
-DESC_WSIL_IMPORT=Import WSDL references to a WSIL document
-PAGE_TITLE_WS_SELECTION=Web Service Selection Page
-PAGE_DESC_WS_SELECTION=Enter a web service URI.
-
-PAGE_MSG_LOADING_WEB_SERVICE_URI=Loading Web service URI...
-PAGE_MSG_INVALID_WEB_SERVICE_URI=Invalid Web service URI.  Enter an URI to a WSDL, WSIL or HTML document.
-PAGE_MSG_NO_SUCH_FILE=File "{0}" does not exists.
-PAGE_MSG_SELECTION_MUST_BE_WSDL=Selection must be WSDL.
-PAGE_MSG_INVALID_WSIL_FILE_NAME=Invalid WSIL file name.  WSIL file name must end with .wsil
-
-
-
-MSG_ERROR_URI_NOT_RESOLVABLE=IWAB0469E "{0}" is not resolvable.
-MSG_ERROR_WSDL_HAS_NO_SERVICE_ELEMENT=IWAB0551E WSDL file at {0} has no service element.
-
-LABEL_WSIL_URI=WSIL URI:
-LABEL_BROWSE=Browse
-LABEL_WSDL=WSDL:
-LABEL_WSDL_URI=WSDL URI
-LABEL_IMPORT=Import...
-LABEL_ADD=Add
-LABEL_REMOVE=Remove
-LABEL_WS_SELECTION=Enter an URI to a WSDL, WSIL or HTML document:
-LABEL_SELECT_WSDL=Select a WSDL
-
-
-TOOLTIP_WSIL_IMPORT_PAGE=This page allows you to add WSDL references to a WSIL document.
-TOOLTIP_WSIL_TEXT_WSIL=Enter the location of a new or existing WSIL document.
-TOOLTIP_WSIL_BUTTON_BROWSE_WSIL=Browse for a WSIL document.
-TOOLTIP_WSIL_TABLE_WSDL=Enter the URIs of the WSDLs that are going to be added as service references.
-TOOLTIP_PCON_PAGE=Select a web service for consumption.
-TOOLTIP_PCON_TEXT_WS=Enter an URI to a WSDL, WSIL or HTML document.
-TOOLTIP_PCON_BUTTON_BROWSE_WS=Browse for a web service resource.
-
-#
-# Tooltips for client.WebServiceClienTestPage
-#
-TOOLTIP_PWSM_PAGE=
-TOOLTIP_PWSM_CHECKBOX_TEST=Enable/disable Test.
-TOOLTIP_PWSM_COMBOBOX_TEST=Select the test type.
-TOOLTIP_PWSM_CHECKBOX_LAUNCH=Run test on a server.
-TOOLTIP_PWSM_TEXT_JSP_FOLDER=Destination folder of generated sample files.
-TOOLTIP_PWSM_BUTTON_JSP_FOLDER_BROWSE=Browse folders.
-TOOLTIP_PWSM_BUTTON_SELECT_ALL=Select all methods.
-TOOLTIP_PWSM_BUTTON_DESELECT_ALL=Deselect all methods.
-TOOLTIP_PWSM_COMBO_PROJECT=Web project for generated sample.
-TOOLTIP_PWSM_TEXT_SAMPLE_FOLDER=Destination folder of generated sample files.
-TOOLTIP_PWSM_TREE_METHODS=Methods to generate into the sample.
-TOOLTIP_PWSM_EAR_PROJECT=EAR project for the generated sample.
-
-#
-# HTTP Basic Auth
-#
-DIALOG_TITLE_HTTP_BASIC_AUTH=HTTP Basic Authentication
-LABEL_URL=URL:
-LABEL_HTTP_BASIC_AUTH_USERNAME=User name:
-LABEL_HTTP_BASIC_AUTH_PASSWORD=Password:
-
-TOOLTIP_HTTP_BASIC_AUTH_USERNAME=Enter your HTTP basic authentication user name.
-TOOLTIP_HTTP_BASIC_AUTH_PASSWORD=Enter your HTTP basic authentication password.
-
-#
-# Web Service Server Runtime Type
-#
-
-
-#
-# Client project type
-#
-
-#
-# Generate Handler Skeleton
-#
-TASK_LABEL_GEN_HANDLER_SKELETON=Generate handler skeleton command
-TASK_DESC_GEN_HANDLER_SKELETON=Generate handler skeleton command
-MSG_ERROR_GENERATE_HANDLER_SKELETON=IWAB0359E Error in generating handler skeleton.
-MSG_ERROR_WRITE_FILE=IWAB0360E Error in writing file {0}.
-
-#
-# Handlers Configuration wizard page
-#
-LABEL_HANDLERS_CONFIG=Handler Configuration
-LABEL_BUTTON_ADD=Add
-LABEL_BUTTON_REMOVE=Remove
-LABEL_BUTTON_MOVE_UP=Move Up
-LABEL_BUTTON_MOVE_DOWN=Move Down
-LABEL_BUTTON_GEN_SKELETON=Generate skeleton classes for new handlers
-LABEL_COMBO_SOURCE_LOC=Output folder:
-LABEL_COMBO_WS_CLIENT_REF=Client Service Reference:
-LABEL_COMBO_WS_SERVICE_DESC=Service Description:
-
-LABEL_HANDLER_NAME=Name
-LABLE_HANDLER_CLASS=Class Name
-LABEL_HANDLER_PORT=Port Name
-
-DIALOG_TITLE_WS_ADD_HANDLER=Add New Handler
-LABEL_TEXT_HANDLER_NAME=Name:
-LABEL_TEXT_HANDLER_CLASS=Class name:
-LABEL_TEXT_HANDLER_PORT=Port name:
-
-PAGE_TITLE_SERVICE_HDLR_CONFIG=Service Handlers Configuration
-PAGE_DESC_SERVICE_HDLR_CONFIG=Configure service-side handlers
-PAGE_TITLE_CLIENT_HDLR_CONFIG=Client Handlers Configuration
-PAGE_DESC_CLIENT_HDLR_CONFIG=Configure client-side handlers
-
-TOOLTIP_EDIT_WS_HANDLERS=Configure Web Service Handlers
-TOOLTIP_BUTTON_GEN_SKELETON=Select to generate skeleton classes for new handlers.
-TOOLTIP_COMBO_SOURCE_LOC=Select the output location for file generation.
-TOOLTIP_TEXT_HANDLER_NAME=Handler name
-TOOLTIP_TEXT_HANDLER_CLASS=Handler class name
-TOOLTIP_TEXT_HANDLER_PORT=Handler port component name
-TOOLTIP_WS_CLIENT_REF=Select a client service-reference to show its handlers.
-TOOLTIP_WS_SERVICE_DESC=Select a service description to show its handlers.
-
-#
-# OpenJavaEditorCommand
-#
-MSG_ERROR_UNABLE_TO_OPEN_JAVA_EDITOR=IWAB0029E Unable to open class {0} from project {1} in the Java editor.
-
-#
-# CheckIfServiceProject
-# 
-MSG_WARN_IS_SERVICE_PROJECT=The selected client project, {0}, contains the Web service. Proceeding with this configuration may result in runtime errors when invoking the Web service. Would you like to proceed?
-MSG_USER_ABORTED=User pressed cancel in warning dialog which warned about the selected client project being the service project.
-
-
-#
-# Missing third party file error message
-#
-MSG_MISSING_THIRD_PARTY_FILES=Missing third party files.  Refer to http://www.eclipse.org/webtools/wst/components/ws/download_instructions_for_jars.html
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/barney/BarneyWebService.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/barney/BarneyWebService.java
deleted file mode 100644
index 49c7a90..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/barney/BarneyWebService.java
+++ /dev/null
@@ -1,158 +0,0 @@
-package org.eclipse.jst.ws.internal.barney;
-
-import java.util.Vector;
-
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.command.internal.provisional.ICommandFactory;
-import org.eclipse.wst.command.internal.provisional.SimpleCommandFactory;
-import org.eclipse.wst.ws.internal.provisional.wsrt.AbstractWebService;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IContext;
-import org.eclipse.wst.ws.internal.provisional.wsrt.ISelection;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebService;
-import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceInfo;
-
-public class BarneyWebService extends AbstractWebService
-{
-	
-
-	public BarneyWebService(WebServiceInfo info)
-	{
-		super(info);
-	}
-
-	public ICommandFactory assemble(Environment env, IContext ctx,
-			ISelection sel, String module, String ear)
-	{
-		Vector commands = new Vector();
-		commands.add(new TestCommand3(this));
-		return new SimpleCommandFactory(commands);
-	}
-
-	public ICommandFactory deploy(Environment env, IContext ctx, ISelection sel,
-			String module, String ear)
-	{
-		Vector commands = new Vector();
-		commands.add(new TestCommand4(this));
-		return new SimpleCommandFactory(commands);
-	}
-
-	public ICommandFactory develop(Environment env, IContext ctx, ISelection sel,
-			String module, String ear)
-	{
-		Vector commands = new Vector();
-		commands.add(new TestCommand1(this));
-		commands.add(new TestCommand2(this));
-		return new SimpleCommandFactory(commands);
-	}
-
-	public ICommandFactory install(Environment env, IContext ctx, ISelection sel,
-			String module, String ear)
-	{
-		Vector commands = new Vector();
-		commands.add(new TestCommand5(this));
-		return new SimpleCommandFactory(commands);
-	}
-
-	public ICommandFactory run(Environment env, IContext ctx, ISelection sel,
-			String module, String ear)
-	{
-		Vector commands = new Vector();
-		commands.add(new TestCommand6(this));
-		return new SimpleCommandFactory(commands);
-	}
-	
- private class TestCommand1 extends SimpleCommand
-	{
-	 IWebService ws;
-	 public TestCommand1(IWebService ws)
-	 {
-		 this.ws=ws;
-	 }
-	 public Status execute(Environment env)
-	 {
-		System.out.println("In barney develop command 1");
-		ws.getWebServiceInfo().setWsdlURL("http://someWSDLURL");
-		return super.execute(env);
-	 }
-	}
-
-	private class TestCommand2 extends SimpleCommand
-	{
-		 IWebService ws;
-		 public TestCommand2(IWebService ws)
-		 {
-			 this.ws=ws;
-		 }
-		 
-		public Status execute(Environment env)
-		{
-			System.out.println("In barney develop command 2");
-			ws.getWebServiceInfo().setImplURL("file://someImplURL");
-			return super.execute(env);
-		}
-	}
-	
-	private class TestCommand3 extends SimpleCommand
-	{
-		 IWebService ws;
-		 public TestCommand3(IWebService ws)
-		 {
-			 this.ws=ws;
-		 }
-		 
-		public Status execute(Environment env)
-		{
-			System.out.println("In barney assemble command");
-			return super.execute(env);
-		}
-	}
-	
-	private class TestCommand4 extends SimpleCommand
-	{
-		 IWebService ws;
-		 public TestCommand4(IWebService ws)
-		 {
-			 this.ws=ws;
-		 }
-		 
-		public Status execute(Environment env)
-		{
-			System.out.println("In barney deploy command");
-			ws.getWebServiceInfo().setEndPointURL("http://someEndpointURL");
-			return super.execute(env);
-		}
-	}
-	
-	private class TestCommand5 extends SimpleCommand
-	{
-		 IWebService ws;
-		 public TestCommand5(IWebService ws)
-		 {
-			 this.ws=ws;
-		 }
-		 
-		public Status execute(Environment env)
-		{
-			System.out.println("In barney install command");
-			return super.execute(env);
-		}
-	}	
-	
-	private class TestCommand6 extends SimpleCommand
-	{
-		 IWebService ws;
-		 public TestCommand6(IWebService ws)
-		 {
-			 this.ws=ws;
-		 }
-		 
-		public Status execute(Environment env)
-		{
-			System.out.println("In barney run command");
-			return super.execute(env);
-		}
-	}	
-}	
-
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/barney/BarneyWebServiceClient.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/barney/BarneyWebServiceClient.java
deleted file mode 100644
index 9f51d38..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/barney/BarneyWebServiceClient.java
+++ /dev/null
@@ -1,154 +0,0 @@
-package org.eclipse.jst.ws.internal.barney;
-
-import java.util.Vector;
-
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.command.internal.provisional.ICommandFactory;
-import org.eclipse.wst.command.internal.provisional.SimpleCommandFactory;
-import org.eclipse.wst.ws.internal.provisional.wsrt.AbstractWebServiceClient;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IContext;
-import org.eclipse.wst.ws.internal.provisional.wsrt.ISelection;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceClient;
-import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceClientInfo;
-
-public class BarneyWebServiceClient extends AbstractWebServiceClient
-{		
-
-	public BarneyWebServiceClient(WebServiceClientInfo info)
-	{
-		super(info);
-		// TODO Auto-generated constructor stub
-	}
-
-	public ICommandFactory assemble(Environment env, IContext ctx,
-			ISelection sel, String module, String ear)
-	{
-		Vector commands = new Vector();
-		commands.add(new TestCommand3(this));
-		return new SimpleCommandFactory(commands);
-	}
-
-	public ICommandFactory deploy(Environment env, IContext ctx, ISelection sel,
-			String module, String ear)
-	{
-		Vector commands = new Vector();
-		commands.add(new TestCommand4(this));
-		return new SimpleCommandFactory(commands);
-	}
-
-	public ICommandFactory develop(Environment env, IContext ctx, ISelection sel,
-			String module, String ear)
-	{
-		Vector commands = new Vector();
-		commands.add(new TestCommand1(this));
-		commands.add(new TestCommand2(this));
-		return new SimpleCommandFactory(commands);
-	}
-
-	public ICommandFactory install(Environment env, IContext ctx, ISelection sel,
-			String module, String ear)
-	{
-		Vector commands = new Vector();
-		commands.add(new TestCommand5(this));
-		return new SimpleCommandFactory(commands);
-	}
-
-	public ICommandFactory run(Environment env, IContext ctx, ISelection sel,
-			String module, String ear)
-	{
-		Vector commands = new Vector();
-		commands.add(new TestCommand6(this));
-		return new SimpleCommandFactory(commands);
-	}
-
-	 private class TestCommand1 extends SimpleCommand
-		{
-		 IWebServiceClient ws;
-		 public TestCommand1(IWebServiceClient ws)
-		 {
-			 this.ws=ws;
-		 }
-		 public Status execute(Environment env)
-		 {
-			System.out.println("In barney client develop command 1");
-			return super.execute(env);
-		 }
-		}
-
-		private class TestCommand2 extends SimpleCommand
-		{
-			 IWebServiceClient ws;
-			 public TestCommand2(IWebServiceClient ws)
-			 {
-				 this.ws=ws;
-			 }
-			 
-			public Status execute(Environment env)
-			{
-				System.out.println("In barney client develop command 2");
-				return super.execute(env);
-			}
-		}
-		
-		private class TestCommand3 extends SimpleCommand
-		{
-			 IWebServiceClient ws;
-			 public TestCommand3(IWebServiceClient ws)
-			 {
-				 this.ws=ws;
-			 }
-			 
-			public Status execute(Environment env)
-			{
-				System.out.println("In barney client assemble command");
-				return super.execute(env);
-			}
-		}
-		
-		private class TestCommand4 extends SimpleCommand
-		{
-			 IWebServiceClient ws;
-			 public TestCommand4(IWebServiceClient ws)
-			 {
-				 this.ws=ws;
-			 }
-			 
-			public Status execute(Environment env)
-			{
-				System.out.println("In barney client deploy command");
-				return super.execute(env);
-			}
-		}
-		
-		private class TestCommand5 extends SimpleCommand
-		{
-			 IWebServiceClient ws;
-			 public TestCommand5(IWebServiceClient ws)
-			 {
-				 this.ws=ws;
-			 }
-			 
-			public Status execute(Environment env)
-			{
-				System.out.println("In barney client install command");
-				return super.execute(env);
-			}
-		}	
-		
-		private class TestCommand6 extends SimpleCommand
-		{
-			 IWebServiceClient ws;
-			 public TestCommand6(IWebServiceClient ws)
-			 {
-				 this.ws=ws;
-			 }
-			 
-			public Status execute(Environment env)
-			{
-				System.out.println("In barney client run command");
-				return super.execute(env);
-			}
-		}		
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/barney/BarneyWebServiceRuntime.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/barney/BarneyWebServiceRuntime.java
deleted file mode 100644
index 4ea7bea..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/barney/BarneyWebServiceRuntime.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.eclipse.jst.ws.internal.barney;
-
-import org.eclipse.wst.ws.internal.provisional.wsrt.AbstractWebServiceRuntime;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebService;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceClient;
-import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceClientInfo;
-import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceInfo;
-
-public class BarneyWebServiceRuntime extends AbstractWebServiceRuntime
-{
-
-	public IWebService getWebService(WebServiceInfo info)
-	{
-    return new BarneyWebService(info);
-	}
-
-	public IWebServiceClient getWebServiceClient(WebServiceClientInfo info)
-	{
-		return new BarneyWebServiceClient(info);
-	}
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/barney/BarneyWidgetFactory.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/barney/BarneyWidgetFactory.java
deleted file mode 100644
index 0e4c4f1..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/barney/BarneyWidgetFactory.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package org.eclipse.jst.ws.internal.barney;
-
-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.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.command.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.env.ui.widgets.WidgetContributorFactory;
-import org.eclipse.wst.command.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.command.internal.provisional.ui.widgets.INamedWidgetContributor;
-import org.eclipse.wst.command.internal.provisional.ui.widgets.INamedWidgetContributorFactory;
-import org.eclipse.wst.command.internal.provisional.ui.widgets.SimpleWidgetContributor;
-
-public class BarneyWidgetFactory implements INamedWidgetContributorFactory {
-
-    private Button checkBox_;
-	private SimpleWidgetContributor widget1_;
-	private SimpleWidgetContributor widget2_;
-	
-	public BarneyWidgetFactory()
-	{
-		widget1_ = new SimpleWidgetContributor();		
-		widget1_.setDescription( "Barney Extentions desc 1" );
-		widget1_.setTitle( "BarneyExtention title 1" );
-		widget1_.setName( "Barney Extension name 1" );
-		widget1_.setFactory( getContributor1() );
-		
-	    widget2_ = new SimpleWidgetContributor();
-		widget2_.setDescription( "Barney Extentions desc 2" );
-		widget2_.setTitle( "Barney Extention title 2" );
-		widget2_.setName( "Barney Extension name 2" );
-		widget2_.setFactory( getContributor2() );
-	}
-	
-	public INamedWidgetContributor getFirstNamedWidget() 
-	{
-	  return widget1_;
-	}
-
-	public INamedWidgetContributor getNextNamedWidget( INamedWidgetContributor widgetContributor) 
-	{
-	  return widgetContributor == widget1_ && checkBox_.getSelection() ? widget2_ : null;
-	}
-	
-	private WidgetContributorFactory getContributor1()
-	{
-	  return new WidgetContributorFactory()
-	  {
-
-		public WidgetContributor create()
-		{
-		  return new SimpleWidgetDataContributor()
-		  {
-		    public WidgetDataEvents addControls(Composite parent, final Listener statusListener) 
-		    {
-			  checkBox_ = new Button( parent, SWT.CHECK );
-			  checkBox_.setText( "Barney Display next page?" );
-			  checkBox_.addSelectionListener( new SelectionAdapter()
-					                          {
-												public void widgetSelected(SelectionEvent e) 
-												{
-												  statusListener.handleEvent( null );
-												}
-					                          });
-			  
-			  return this;
-		    }
-
-		    public Status getStatus() 
-		    {
-			  return new SimpleStatus("");
-		    }
-		  };
-		}  
-	  };
-	}
-	
-	private WidgetContributorFactory getContributor2()
-	{
-	  return new WidgetContributorFactory()
-	  {
-
-		public WidgetContributor create()
-		{
-		  return new SimpleWidgetDataContributor()
-		  {
-		    public WidgetDataEvents addControls(Composite parent, final Listener statusListener) 
-		    {
-              Label label = new Label( parent, SWT.NONE );
-			  label.setText( "Barney Optional second page" );
-			  
-			  return this;
-		    }
-
-		    public Status getStatus() 
-		    {
-			  return new SimpleStatus("");
-		    }
-		  };
-		}  
-	  };
-	}
-
-	public void registerDataMappings(DataMappingRegistry dataRegistry) {
-		// TODO Auto-generated method stub
-		
-	}
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/barney/BarneyWidgetFactory2.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/barney/BarneyWidgetFactory2.java
deleted file mode 100644
index 8cfe176..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/barney/BarneyWidgetFactory2.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package org.eclipse.jst.ws.internal.barney;
-
-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.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.command.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.env.ui.widgets.WidgetContributorFactory;
-import org.eclipse.wst.command.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.command.internal.provisional.ui.widgets.INamedWidgetContributor;
-import org.eclipse.wst.command.internal.provisional.ui.widgets.INamedWidgetContributorFactory;
-import org.eclipse.wst.command.internal.provisional.ui.widgets.SimpleWidgetContributor;
-
-public class BarneyWidgetFactory2 implements INamedWidgetContributorFactory {
-
-    private Button checkBox_;
-	private SimpleWidgetContributor widget1_;
-	private SimpleWidgetContributor widget2_;
-	
-	public BarneyWidgetFactory2()
-	{
-		widget1_ = new SimpleWidgetContributor();		
-		widget1_.setDescription( "Barney2 Extentions Second round desc 1" );
-		widget1_.setTitle( "Barney2 Extention Second round title 1" );
-		widget1_.setName( "Barney2 Extension name 1" );
-		widget1_.setFactory( getContributor1() );
-		
-	    widget2_ = new SimpleWidgetContributor();
-		widget2_.setDescription( "Barney2 Extentions Second round desc 2" );
-		widget2_.setTitle( "Barney2 Extention Second round  title 2" );
-		widget2_.setName( "Barney2 Extension name 2" );
-		widget2_.setFactory( getContributor2() );
-	}
-	
-	public INamedWidgetContributor getFirstNamedWidget() 
-	{
-	  return widget1_;
-	}
-
-	public INamedWidgetContributor getNextNamedWidget( INamedWidgetContributor widgetContributor) 
-	{
-	  return widgetContributor == widget1_ && checkBox_.getSelection() ? widget2_ : null;
-	}
-	
-	private WidgetContributorFactory getContributor1()
-	{
-	  return new WidgetContributorFactory()
-	  {
-
-		public WidgetContributor create()
-		{
-		  return new SimpleWidgetDataContributor()
-		  {
-		    public WidgetDataEvents addControls(Composite parent, final Listener statusListener) 
-		    {
-			  checkBox_ = new Button( parent, SWT.CHECK );
-			  checkBox_.setText( "Barney2 Display next page again?" );
-			  checkBox_.addSelectionListener( new SelectionAdapter()
-					                          {
-												public void widgetSelected(SelectionEvent e) 
-												{
-												  statusListener.handleEvent( null );
-												}
-					                          });
-			  
-			  return this;
-		    }
-
-		    public Status getStatus() 
-		    {
-			  return new SimpleStatus("");
-		    }
-		  };
-		}  
-	  };
-	}
-	
-	private WidgetContributorFactory getContributor2()
-	{
-	  return new WidgetContributorFactory()
-	  {
-
-		public WidgetContributor create()
-		{
-		  return new SimpleWidgetDataContributor()
-		  {
-		    public WidgetDataEvents addControls(Composite parent, final Listener statusListener) 
-		    {
-              Label label = new Label( parent, SWT.NONE );
-			  label.setText( "Barney2 Optional second round 2 page" );
-			  
-			  return this;
-		    }
-
-		    public Status getStatus() 
-		    {
-			  return new SimpleStatus("");
-		    }
-		  };
-		}  
-	  };
-	}
-
-	public void registerDataMappings(DataMappingRegistry dataRegistry) {
-		// TODO Auto-generated method stub
-		
-	}
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/action/LaunchWSEAction.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/action/LaunchWSEAction.java
deleted file mode 100644
index 861ec6c..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/action/LaunchWSEAction.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 Eclipse Public License v1.0
- * which accompanies 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.consumption.ui.action;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-
-import org.eclipse.jst.ws.internal.explorer.LaunchOption;
-import org.eclipse.jst.ws.internal.explorer.LaunchOptions;
-import org.eclipse.jst.ws.internal.explorer.WSExplorerLauncherCommand;
-import org.eclipse.jst.ws.internal.explorer.plugin.ExplorerPlugin;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-import org.eclipse.wst.command.env.core.context.TransientResourceContext;
-import org.eclipse.wst.command.env.ui.eclipse.EclipseEnvironment;
-import org.eclipse.wst.command.env.ui.eclipse.EclipseProgressMonitor;
-import org.eclipse.wst.command.env.ui.eclipse.EclipseStatusHandler;
-
-
-public class LaunchWSEAction implements IWorkbenchWindowActionDelegate
-{
-  public void run(IAction action)
-  {
-    EclipseStatusHandler             handler     = new EclipseStatusHandler();
-    EclipseProgressMonitor           monitor     = new EclipseProgressMonitor();
-    TransientResourceContext         context     = new TransientResourceContext();
-    EclipseEnvironment               environment = new EclipseEnvironment( null, context, monitor, handler ); 
-    WSExplorerLauncherCommand        cmd         = new WSExplorerLauncherCommand();
-    
-    String stateLocation = ExplorerPlugin.getInstance().getPluginStateLocation();
-	LaunchOption[] launchOptions = new LaunchOption[] {
-		new LaunchOption(LaunchOptions.STATE_LOCATION,stateLocation)
-	};
-    cmd.setLaunchOptions(launchOptions);
-	cmd.execute( environment );
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#dispose()
-   */
-  public void dispose() {  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#init(org.eclipse.ui.IWorkbenchWindow)
-   */
-  public void init(IWorkbenchWindow window) {  }
-  
-  /* (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) {  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/CheckForMissingFiles.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/CheckForMissingFiles.java
deleted file mode 100644
index 4ce95ab..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/CheckForMissingFiles.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.internal.consumption.ui.command;
-
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.common.internal.dependencychecker.CheckMissingFiles;
-
-public class CheckForMissingFiles extends SimpleCommand
-{
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.core.Command#execute(org.eclipse.wst.command.env.core.common.Environment)
-   */
-  public Status execute(Environment environment) 
-  {
-    Status  status       = new SimpleStatus( "" );
-    String  pluginId     = "org.eclipse.jst.ws.consumption.ui";
-    boolean missingFiles = CheckMissingFiles.hasMissingFiles( pluginId );
-    
-    if( missingFiles )
-    {
-      MessageUtils msgUtils = new MessageUtils(pluginId + ".plugin", this);  
-      status = new SimpleStatus( "", msgUtils.getMessage( "MSG_MISSING_THIRD_PARTY_FILES" ), Status.ERROR );
-      environment.getStatusHandler().reportError( status );
-    }
-    
-    return status;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/CheckForServiceProjectCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/CheckForServiceProjectCommand.java
deleted file mode 100644
index 8c8c892..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/CheckForServiceProjectCommand.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.jst.ws.internal.consumption.ui.command;
-
-import java.util.Calendar;
-import java.util.GregorianCalendar;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.ws.internal.common.StringToIProjectTransformer;
-import org.eclipse.jst.ws.internal.consumption.ui.common.ValidationUtils;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.command.env.core.common.StatusException;
-import org.eclipse.wst.command.env.core.selection.SelectionListChoices;
-import org.eclipse.wst.ws.parser.wsil.WebServicesParser;
-
-
-/**
- * This command checks to see if the selected client project is the
- * service project. If so, the user is warned.
- */
-public class CheckForServiceProjectCommand extends SimpleCommand
-{
-  MessageUtils msgUtils;
-  SelectionListChoices runtime2ClientTypes;
-  String wsdlURI;
-  WebServicesParser webServicesParser;
-    
-  public CheckForServiceProjectCommand()
-  {
-    String pluginId = "org.eclipse.jst.ws.consumption.ui";
-    msgUtils = new MessageUtils(pluginId + ".plugin", this);  
-  }
-  
-  public void setRuntime2ClientTypes( SelectionListChoices runtime2ClientTypes )
-  {
-    this.runtime2ClientTypes = runtime2ClientTypes;
-  }
-  
-  public void setWsdlURI(String wsdlURI)
-  {
-    this.wsdlURI = wsdlURI;
-  }
-
-  public void setWebServicesParser(WebServicesParser webServicesParser)
-  {
-    this.webServicesParser = webServicesParser;
-  }
-  
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.core.Command#execute(org.eclipse.wst.command.env.core.common.Environment)
-   */
-  public Status execute(Environment environment)
-  {
-    Status status = new SimpleStatus("");
-    if (runtime2ClientTypes==null || wsdlURI==null || wsdlURI.length()==0 || webServicesParser==null)
-      return status;
-    
-    String clientProjectName = runtime2ClientTypes.getChoice().getChoice().getList().getSelection();
-    if (clientProjectName==null || clientProjectName.length()==0)
-      return status;
-    
-    IProject clientProject = (IProject)((new StringToIProjectTransformer()).transform(clientProjectName));
-    ValidationUtils vu = new ValidationUtils();
-    Calendar cal = new GregorianCalendar();
-    boolean isServiceProject = vu.isProjectServiceProject(clientProject, wsdlURI, webServicesParser);
-    if (isServiceProject)
-    {
-      Status wStatus = new SimpleStatus("", msgUtils.getMessage("MSG_WARN_IS_SERVICE_PROJECT", new String[]{clientProjectName}), Status.WARNING);
-      try
-      {
-        environment.getStatusHandler().report(wStatus);
-      }
-      catch (StatusException se)
-      {
-        //User decided to abort. Return an error status
-        Status eStatus = new SimpleStatus("", msgUtils.getMessage("MSG_USER_ABORTED"), Status.ERROR);
-        return eStatus;
-      }
-    }
-    
-    return status;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/GenerateHandlerSkeletonCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/GenerateHandlerSkeletonCommand.java
deleted file mode 100644
index 3e26a34..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/GenerateHandlerSkeletonCommand.java
+++ /dev/null
@@ -1,257 +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.consumption.ui.command;
-
-import java.io.BufferedWriter;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jst.ws.internal.common.EnvironmentUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.wst.command.env.common.FileResourceUtils;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-
-
-
-public class GenerateHandlerSkeletonCommand extends SimpleCommand
-{
-
-  private IProject serviceProject_;
-  private MessageUtils msgUtils_;
- 
-  private String LABEL = "TASK_LABEL_GEN_HANDLER_SKELETON";
-  private String DESCRIPTION = "TASK_DESC_GEN_HANDLER_SKELETON";
-  
-  private IPath outputLocation_;
-  private String[] handlerNames_;
-  private boolean genSkeleton_;
-  private String handlerNameForEdit_ = null;
-  
-  public GenerateHandlerSkeletonCommand()
-  {
-    String       pluginId = "org.eclipse.jst.ws.consumption.ui";
-  	msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
-  	setName (msgUtils_.getMessage(LABEL));
-  	setDescription( msgUtils_.getMessage(DESCRIPTION));    
-  }
-  
-
-  public Status execute (Environment env)
-  {
-  	
-  	if (!genSkeleton_)
-  		return new SimpleStatus(""); 
-  	
-  	int i;
-  	boolean error = false;
-  	boolean warning = false;
-  	
-  	SimpleStatus status = null;
-  	Status writeStatus;	
-  	
-  	
-    for (i=0; i<handlerNames_.length; i++) {
-    	writeStatus = writeFile(env, handlerNames_[i], outputLocation_);
-    	// handle status return
-    	if (writeStatus.getSeverity() == Status.ERROR) {  // write status is OK or ERROR
-    		error = true;
-    		if (status == null) {
-    			status = new SimpleStatus( "execute", msgUtils_.getMessage("MSG_ERROR_GENERATE_HANDLER_SKELETON"), Status.ERROR);
-    		}
-    		status.addChild(writeStatus);
-    	} 
-    }
-    if (error) {
-       env.getStatusHandler().reportError(status);
-    } else {
-    	status = new SimpleStatus( "" );
-    }
-  	return status;
-  }
-  
-  public Status writeFile (Environment env, String className, IPath outputLocation) 
-  {
-  	Status status = new SimpleStatus("");
-  	int index;
-  	
-  	String simpleClassName = className;
-  	String packageName = null;
-  	IPath filePath = outputLocation;
-  	if (className != null) {
-  		index = className.lastIndexOf('.');
-  		if (index != -1) {
-  			simpleClassName = className.substring(index + 1);
-  			packageName = className.substring(0, index);
-  			
-  		  	String packageSegment = packageName;
-  		  	int j = 0;
-  		  	j = packageSegment.indexOf('.');
-  		  	while (j != -1) {
-  		  		filePath = filePath.append(packageSegment.substring(0, j));
-  		  		packageSegment = packageSegment.substring(j + 1);
-  		  		j = packageSegment.indexOf('.');
-  		  	}
-  		    filePath = filePath.append(packageSegment);
-  		}
-  		else {
-  		  packageName = "";
-  		}
-  	}
-  	
-  	filePath = filePath.append(simpleClassName);
-  	
-  	filePath = filePath.addFileExtension("java");
-
-  	// check if Handler already exists; do not overwrite existing Handlers
-  	IResource workspaceRes = ResourceUtils.findResource(filePath);
-  	if (workspaceRes!=null && workspaceRes.exists()) {
-  		return status;
-  	}
-  	
-  	if (handlerNameForEdit_ == null){
-  		handlerNameForEdit_ = className;
-  	}
-  	
-  	OutputStream outputStream = FileResourceUtils.newFileOutputStream( EnvironmentUtils.getResourceContext(env), filePath, env.getProgressMonitor(), env.getStatusHandler());
-  	// create buffered writer for writing file
-  	BufferedWriter bw = new BufferedWriter(new OutputStreamWriter(outputStream));
-  	try {
-  		if (packageName.length() != 0) {
-  			bw.write("package " +packageName+";");
-  			bw.newLine();
-  			bw.newLine();
-  		}
-  		bw.write("import javax.xml.rpc.handler.GenericHandler;");
-  		bw.newLine();
-  		bw.write("import javax.xml.rpc.handler.MessageContext;");
-  		bw.newLine();
-  		bw.write("import javax.xml.namespace.QName;");
-  		bw.newLine();
-  		bw.newLine();
-  		
-  		bw.write("public class "+simpleClassName+" extends GenericHandler");
-  		bw.newLine();
-  		bw.write("{");
-  		bw.newLine();
-  		bw.newLine();
-  		
-  		bw.write("   public QName[] getHeaders ()");
-  		bw.newLine();
-  		bw.write("   {");
-  		bw.newLine();
-  		bw.write("      // Fill in method body");
-  		bw.newLine();
-  		bw.write("      return null;");
-  		bw.newLine();
-  		bw.write("   }");
-  		bw.newLine();
-  		bw.newLine();
-  		bw.write("   public boolean handleRequest( MessageContext context )");
-  		bw.newLine();
-  		bw.write("   {");
-  		bw.newLine();
-  		bw.write("      // Fill in method body or delete method to use GenericHandler");
-  		bw.newLine();
-  		bw.write("      return true;");
-  		bw.newLine();
-  		bw.write("   }");
-  		bw.newLine();
-  		bw.newLine();
-  		bw.write("   public boolean handleResponse( MessageContext context )");
-  		bw.newLine();
-  		bw.write("   {");
-  		bw.newLine();
-  		bw.write("      // Fill in method body or delete method to use GenericHandler ");
-  		bw.newLine();
-  		bw.write("      return true;");
-  		bw.newLine();
-  		bw.write("   }");
-  		bw.newLine();
-  		bw.newLine();
-  		bw.write("   public boolean handleFault( MessageContext context )");
-  		bw.newLine();
-  		bw.write("   {");
-  		bw.newLine();
-  		bw.write("      // Fill in method body or delete method to use GenericHandler");
-  		bw.newLine();
-  		bw.write("      return true;");
-  		bw.newLine();
-  		bw.write("   }");
-  		bw.newLine();
-  		
-  		bw.newLine();
-  		bw.write("}");
-  		bw.close();
-  		status = new SimpleStatus( "" );	
-  	} catch (IOException e) {
-  		status = new SimpleStatus( "writeFile", msgUtils_.getMessage("MSG_ERROR_WRITE_FILE", new String[]{ className }), Status.ERROR, e );
-  		if (bw != null) {
-  			try {
-  				bw.close();
-  			} catch (IOException e1) {
-  			}
-  		}
-  	}
-  	return status;
-  }
-
-  public Status undo(Environment environment)
-  {
-    return null;
-  }
-
-  public Status redo(Environment environment)
-  {
-    return null;
-  }
-  
-  public void setOutputLocation(IPath outputLocation) 
-  {
-	this.outputLocation_ = outputLocation;
-  }
-  
-  public void setHandlerNames (String[] handlerNames)
-  {
-  	this.handlerNames_ = handlerNames;
-  }
-  
-  public void setGenSkeletonEnabled(boolean genSkeleton)
-  {
-  	this.genSkeleton_ = genSkeleton;
-  }
-  
-  public IProject getProject(){
-  	IProject project = null;
-  	if (outputLocation_!=null){
-  		project = ResourceUtils.getProjectOf(outputLocation_);
-  	}
-  	return project;
-  }
-  
-  public List getClassNames(){
-  	List classes = new ArrayList();
-  	if (handlerNameForEdit_!=null){
-  		classes.add(handlerNameForEdit_);
-  	}
-  	return classes;
-  }
-  
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/OpenJavaEditorCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/OpenJavaEditorCommand.java
deleted file mode 100644
index 8b98767..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/OpenJavaEditorCommand.java
+++ /dev/null
@@ -1,95 +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.consumption.ui.command;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.ui.progress.UIJob;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-
-
-public class OpenJavaEditorCommand extends SimpleCommand
-{
-  private List classNames;
-  private IProject project;
-
-  public OpenJavaEditorCommand()
-  {
-  }
-
-  public Status execute(Environment environment)
-  {
-    OpenJavaEditorJob job = new OpenJavaEditorJob(classNames, project);
-    job.setPriority(Job.LONG);
-    job.schedule();
-    return new SimpleStatus("");
-  }
-
-  public void setClassNames(List classNames)
-  {
-    this.classNames = classNames;
-  }
-
-  public void setProject(IProject project)
-  {
-    this.project = project;
-  }
-  
-  private class OpenJavaEditorJob extends UIJob
-  {
-    private List classNames;
-    private IProject project;
-
-    public OpenJavaEditorJob(List classNames, IProject project)
-    {
-      super("org.eclipse.jst.ws.internal.consumption.ui.command.OpenJavaEditorJob");
-      this.classNames = classNames;
-      this.project = project;
-    }
-    
-    public IStatus runInUIThread(IProgressMonitor monitor)
-    {
-      if (project != null && classNames != null)
-      {
-        IJavaProject javaProject = JavaCore.create(project);
-        for (Iterator it = classNames.iterator(); it.hasNext();)
-        {
-          String className = (String)it.next();
-          try
-          {
-            IType type = javaProject.findType(className);
-            JavaUI.openInEditor(type);
-          }
-          catch (Throwable t)
-          {
-            return new org.eclipse.core.runtime.Status(org.eclipse.core.runtime.Status.ERROR, WebServiceConsumptionUIPlugin.ID, 0, WebServiceConsumptionUIPlugin.getMessage("MSG_ERROR_UNABLE_TO_OPEN_JAVA_EDITOR", new String[]{className, project.getName()}), t);
-          }
-        }
-        return new org.eclipse.core.runtime.Status(org.eclipse.core.runtime.Status.OK, WebServiceConsumptionUIPlugin.ID, 0, "", null);
-      }
-      else
-        return new org.eclipse.core.runtime.Status(org.eclipse.core.runtime.Status.ERROR, WebServiceConsumptionUIPlugin.ID, 0, WebServiceConsumptionUIPlugin.getMessage("MSG_ERROR_UNABLE_TO_OPEN_JAVA_EDITOR", new String[]{classNames != null ? classNames.toString() : "", project != null ? project.getName() : ""}), null);
-    }
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/WSINonCompliantRuntimeCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/WSINonCompliantRuntimeCommand.java
deleted file mode 100644
index 4f64966..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/WSINonCompliantRuntimeCommand.java
+++ /dev/null
@@ -1,92 +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.consumption.ui.command;
-
-import java.util.Vector;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.wst.ws.internal.ui.plugin.WSUIPlugin;
-import org.eclipse.wst.ws.internal.ui.wsi.preferences.PersistentWSIAPContext;
-import org.eclipse.wst.ws.internal.ui.wsi.preferences.PersistentWSISSBPContext;
-import org.eclipse.wst.ws.internal.ui.wsi.preferences.WSIComplianceUtils;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-
-
-
-public class WSINonCompliantRuntimeCommand extends SimpleCommand
-{
-
-  private IProject serviceProject_;
-  private MessageUtils msgUtils_;
- 
-  private String LABEL = "TASK_LABEL_WSI_NONCOMPLIANT";
-  private String DESCRIPTION = "TASK_DESC_WSI_NONCOMPLIANT";
-	
-  public WSINonCompliantRuntimeCommand()
-  {
-    String       pluginId = "org.eclipse.wst.ws.ui";
-  	msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
-  	setName (msgUtils_.getMessage(LABEL));
-  	setDescription( msgUtils_.getMessage(DESCRIPTION));    
-  }
-  
-
-  public Status execute (Environment environment)
-  {
-    
-  	PersistentWSISSBPContext wsiSSBPContext = WSUIPlugin.getInstance().getWSISSBPContext(); 
-  	PersistentWSIAPContext wsiAPContext = WSUIPlugin.getInstance().getWSIAPContext(); 
-    Vector statusSSBP = new Vector();
-    statusSSBP.add(new SimpleStatus("WSINonCompliantRuntimeCommand", 
-    		msgUtils_.getMessage("WSI_SSBP_INCOMPLIANT_RUNTIME"), WSIComplianceUtils.getWSISeverity(serviceProject_, wsiSSBPContext)));
-    Status[] statusesSSBP = (Status[]) statusSSBP.toArray(new Status[statusSSBP.size()]);
-    
-    Vector statusAP = new Vector();
-    statusAP.add(new SimpleStatus("WSINonCompliantRuntimeCommand", 
-    		msgUtils_.getMessage("WSI_AP_INCOMPLIANT_RUNTIME"), WSIComplianceUtils.getWSISeverity(serviceProject_, wsiAPContext)));
-    Status[] statusesAP = (Status[]) statusAP.toArray(new Status[statusAP.size()]);
-
-    if (WSIComplianceUtils.checkWSICompliance (environment.getStatusHandler(), statusesSSBP, serviceProject_, wsiSSBPContext)) {
-    	if (WSIComplianceUtils.checkWSICompliance (environment.getStatusHandler(), statusesAP, serviceProject_, wsiAPContext)) {
-    		return new SimpleStatus( "" );
-    	} else {
-    		return new SimpleStatus(
-    				"WSINonCompliantRuntimeCommand",
-    				msgUtils_.getMessage("NOT_OK"),
-    				Status.ERROR);
-    	}
-    } else {
-		return new SimpleStatus(
-				"WSINonCompliantRuntimeCommand",
-				msgUtils_.getMessage("NOT_OK"),
-				Status.ERROR);
-		}
-  }
-
-  public Status undo(Environment environment)
-  {
-    return null;
-  }
-
-  public Status redo(Environment environment)
-  {
-    return null;
-  }
-  
-  public void setServiceProject(IProject serviceProject) {
-	this.serviceProject_ = serviceProject;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/EclipseIPath2URLStringTransformer.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/EclipseIPath2URLStringTransformer.java
deleted file mode 100644
index 6c52632..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/EclipseIPath2URLStringTransformer.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.internal.consumption.ui.command.data;
-
-import java.net.MalformedURLException;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.wst.command.env.core.data.Transformer;
-
-
-public class EclipseIPath2URLStringTransformer implements Transformer
-{
-  public Object transform(Object value)
-  {
-    String s = value.toString();
-    if (s.indexOf(":") < 0)
-    {
-      IResource res = ResourcesPlugin.getWorkspace().getRoot().findMember(value.toString());
-      if (res.exists())
-      {
-        try
-        {
-          s = res.getLocation().toFile().toURL().toString();
-        }
-        catch (MalformedURLException murle)
-        {
-        }
-      }
-    }
-    return s;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/ProjectName2IProjectTransformer.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/ProjectName2IProjectTransformer.java
deleted file mode 100644
index fb25883..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/ProjectName2IProjectTransformer.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.jst.ws.internal.consumption.ui.command.data;
-
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.wst.command.env.core.data.Transformer;
-
-public class ProjectName2IProjectTransformer implements Transformer
-{
-  public Object transform(Object value)
-  {
-    return ResourcesPlugin.getWorkspace().getRoot().getProject(value.toString());
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/ServerInstToIServerTransformer.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/ServerInstToIServerTransformer.java
deleted file mode 100644
index c522b84..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/ServerInstToIServerTransformer.java
+++ /dev/null
@@ -1,38 +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 20, 2004
- */
-package org.eclipse.jst.ws.internal.consumption.ui.command.data;
-
-import org.eclipse.wst.command.env.core.data.Transformer;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-
-/*
- * Transforms a server instance id to an IServer
- */
-public class ServerInstToIServerTransformer implements Transformer {
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.core.data.Transformer#transform(java.lang.Object)
-   */
-  public Object transform(Object value) {
-    
-    String existingServerInstId = (String)value;
-    IServer serverInst = null;
-    if (existingServerInstId != null) {
-    	serverInst = ServerCore.findServer(existingServerInstId);
-    }
-    return serverInst;
-  }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/ServerName2IServerTransformer.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/ServerName2IServerTransformer.java
deleted file mode 100644
index c6a46c3..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/ServerName2IServerTransformer.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.jst.ws.internal.consumption.ui.command.data;
-
-import java.util.Vector;
-
-import org.eclipse.wst.command.env.core.data.Transformer;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-
-public class ServerName2IServerTransformer implements Transformer
-{
-  public Object transform(Object value)
-  {
-    Vector serverIds = new Vector();
-    {
-      String serverName = value.toString();
-      IServer[] servers = ServerCore.getServers();
-      if (servers != null && servers.length!=0)
-      {
-        for (int i = 0; i < servers.length; i++)
-        {
-          IServer server = (IServer)servers[i];
-          if ((server.getName()).equals(serverName))
-            return server;
-        }
-      }
-    }
-    return null;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/ClientServerSelectionUtils.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/ClientServerSelectionUtils.java
deleted file mode 100644
index 4a6be03..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/ClientServerSelectionUtils.java
+++ /dev/null
@@ -1,510 +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.consumption.ui.common;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jst.j2ee.internal.servertarget.IServerTargetConstants;
-import org.eclipse.jst.j2ee.internal.servertarget.ServerTargetHelper;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.jst.ws.internal.consumption.common.IServerDefaulter;
-import org.eclipse.jst.ws.internal.consumption.common.ServerInfo;
-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.wizard.WebServiceClientTypeRegistry;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.IServerType;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.server.core.ServerUtil;
-
-
-public class ClientServerSelectionUtils
-{
-  /*
-   * Returns reasonable defaults for server factory id and instance id based on 
-   * an existing project
-   * index [0] contains factoryId, index[1] contains instance Id.
-   * @deprecated
-   */
-  public static String[] getServerInfoFromExistingProject(IProject project, String typeId, boolean askExtenders)
-  {
-    String[] serverInfo = new String[2]; //serverInfp[0] contains factoryId, serverInfo[1] contains instance Id
-    
-    // If the project has been added to an existing server, pick that server
-    IServer[] configuredServers = ServerUtil.getServersByModule(ResourceUtils.getModule(project), null);
-    IServer firstSupportedServer = getFirstSupportedServer(configuredServers, typeId );
-    if (firstSupportedServer != null)
-    {
-      serverInfo[0] = firstSupportedServer.getServerType().getId();
-      serverInfo[1] = firstSupportedServer.getId();
-      return serverInfo;      	
-    }
-    
-    //Does the project have a runtime-target?
-    IRuntime runtimeTarget = getRuntimeTarget(project.getName());
-    if (runtimeTarget != null)
-    {
-      //Look for an existing server which is compatible with the runtime-target
-      IServer[] compatibleServers = getCompatibleExistingServers(runtimeTarget);
-      if (compatibleServers!=null && compatibleServers.length > 0)
-      {
-        IServer firstSupportedCompatServer = getFirstSupportedServer(compatibleServers, typeId);
-        if (firstSupportedCompatServer != null)
-        {
-          serverInfo[0] = firstSupportedCompatServer.getServerType().getId();
-          serverInfo[1] = firstSupportedCompatServer.getId();
-          return serverInfo;
-          
-        }  
-      }
-      
-      //No existing compatible server was found. Choose a compatible server type.
-      
-      //If the preferred server is compatible with the project's runtime target, use it.
-      PersistentServerRuntimeContext ctx = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext();
-      String pFactoryId = ctx.getServerFactoryId();
-      IServerType serverType = ServerCore.findServerType(pFactoryId);
-      if (serverType!=null){
-      	String serverRuntimeId = serverType.getRuntimeType().getId();
-      	if (serverRuntimeId.equals(runtimeTarget.getRuntimeType().getId()))
-      	{
-      	  serverInfo[0] = pFactoryId;
-      	  return serverInfo;
-      	}
-      }     
-      
-      //The preferred server was not compatible. Pick the first valid compatible server type.      
-      String factoryId = getFirstSupportedServerType(runtimeTarget, typeId);
-      if (factoryId != null) serverInfo[0] = factoryId;
-      return serverInfo;
-      
-    }
-    
-    
-    if (askExtenders)
-    {
-      ServerInfo recommendedServerInfo = getExtenderRecommendation(project);
-      if (recommendedServerInfo!=null)
-      {
-        if (recommendedServerInfo.getServerFactoryId()!=null && recommendedServerInfo.getServerFactoryId().length()>0)
-          serverInfo[0] = recommendedServerInfo.getServerFactoryId();
-        
-        if (recommendedServerInfo.getServerInstanceId()!=null && recommendedServerInfo.getServerInstanceId().length()>0)
-          serverInfo[1] = recommendedServerInfo.getServerInstanceId(); 
-
-        return serverInfo;
-      }
-    }
-    
-    //Use ServerTargetHelper to get a list of valid runtime-targets and use these to determine a default server type.
-    String[] projectAttrs = ServerTargetHelper.getProjectTypeAndJ2EELevel(project);
-    List runtimes = ServerTargetHelper.getServerTargets(projectAttrs[0], projectAttrs[1]);
-    String[] compatServerInfo = getCompatibleExistingServer(runtimes,typeId); 
-    if ( compatServerInfo != null)
-    {
-      return compatServerInfo;
-    }
-    
-    //No existing compatible server, pick a type.
-    String factoryId = getFirstSupportedServerType(runtimes, typeId);
-    if (factoryId != null) serverInfo[0] = factoryId; 
-    return serverInfo;   
-
-  }
-
-  /*
-   * Returns reasonable defaults for server factory id and instance id based on 
-   * an existing project
-   * index [0] contains factoryId, index[1] contains instance Id.
-   * @deprecated
-   */
-  public static String[] getServerInfoFromExistingProject(IProject project, String typeId, String runtimeId, boolean askExtenders)
-  {
-    String[] serverInfo = new String[2]; //serverInfp[0] contains factoryId, serverInfo[1] contains instance Id
-    
-    // If the project has been added to an existing server, pick that server
-    IServer[] configuredServers = ServerUtil.getServersByModule(ResourceUtils.getModule(project), null);
-    IServer firstSupportedServer = getFirstSupportedServer(configuredServers, typeId );
-    if (firstSupportedServer != null)
-    {
-      serverInfo[0] = firstSupportedServer.getServerType().getId();
-      serverInfo[1] = firstSupportedServer.getId();
-      return serverInfo;      	
-    }
-    
-    //Does the project have a runtime-target?
-    IRuntime runtimeTarget = getRuntimeTarget(project.getName());
-    if (runtimeTarget != null)
-    {
-      //Look for an existing server which is compatible with the runtime-target
-      IServer[] compatibleServers = getCompatibleExistingServers(runtimeTarget);
-      if (compatibleServers!=null && compatibleServers.length > 0)
-      {
-        IServer firstSupportedCompatServer = getFirstSupportedServer(compatibleServers, typeId);
-        if (firstSupportedCompatServer != null)
-        {
-          serverInfo[0] = firstSupportedCompatServer.getServerType().getId();
-          serverInfo[1] = firstSupportedCompatServer.getId();
-          return serverInfo;
-          
-        }  
-      }
-      
-      //No existing compatible server was found. Choose a compatible server type.
-      
-      //If the preferred server is compatible with the project's runtime target, use it.
-      PersistentServerRuntimeContext ctx = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext();
-      String pFactoryId = ctx.getServerFactoryId();
-      IServerType serverType = ServerCore.findServerType(pFactoryId);
-      if (serverType!=null){
-      	String serverRuntimeId = serverType.getRuntimeType().getId();
-      	if (serverRuntimeId.equals(runtimeTarget.getRuntimeType().getId()))
-      	{
-      	  serverInfo[0] = pFactoryId;
-      	  return serverInfo;
-      	}
-      }     
-      
-      //The preferred server was not compatible. Pick the first valid compatible server type.      
-      String factoryId = getFirstSupportedServerType(runtimeTarget, typeId);
-      if (factoryId != null) serverInfo[0] = factoryId;
-      return serverInfo;
-      
-    }
-    
-    
-    if (askExtenders)
-    {
-      ServerInfo recommendedServerInfo = getExtenderRecommendation(project);
-      if (recommendedServerInfo!=null)
-      {
-        if (recommendedServerInfo.getServerFactoryId()!=null && recommendedServerInfo.getServerFactoryId().length()>0)
-          serverInfo[0] = recommendedServerInfo.getServerFactoryId();
-        
-        if (recommendedServerInfo.getServerInstanceId()!=null && recommendedServerInfo.getServerInstanceId().length()>0)
-          serverInfo[1] = recommendedServerInfo.getServerInstanceId(); 
-
-        return serverInfo;
-      }
-    }
-    
-    //Use ServerTargetHelper to get a list of valid runtime-targets and use these to determine a default server type.
-    String[] projectAttrs = ServerTargetHelper.getProjectTypeAndJ2EELevel(project);
-    List runtimes = ServerTargetHelper.getServerTargets(projectAttrs[0], projectAttrs[1]);
-    List suppRuntimes = getRuntimeTargetsSupportedByWSRuntime(runtimes, runtimeId);
-    String[] compatServerInfo = getCompatibleExistingServer(suppRuntimes,typeId); 
-    if ( compatServerInfo != null)
-    {
-      return compatServerInfo;
-    }
-    
-    //No existing compatible server, pick a type.
-    String factoryId = getFirstSupportedServerType(suppRuntimes, typeId);
-    if (factoryId != null) serverInfo[0] = factoryId; 
-    return serverInfo;   
-
-  }
-  
-  /*
-   * Given a list of existing servers, this returns the first one that is supported
-   * by the given Web service type id. 
-   * Returns null of there are no supported servers in the array.
-   */
-  public static IServer getFirstSupportedServer(IServer[] servers, String typeId)
-  {
-    WebServiceClientTypeRegistry wsctRegistry = WebServiceClientTypeRegistry.getInstance();
-    if (servers != null && servers.length > 0) {
-      for (int i = 0; i < servers.length; i++)
-      {
-        String serverFactoryId = servers[i].getServerType().getId();
-        if (wsctRegistry.isServerSupportedForChosenType(typeId, serverFactoryId))
-        {
-          return servers[i];
-        }
-      }
-    }
-    return null;
-  }  
-  
-  /*
-   * Returns the factory id of a server type compatible with the Web service type and the runtime target.
-   * Returns null if there are none.
-   */
-  public static String getFirstSupportedServerType(IRuntime runtimeTarget, String typeId)
-  {
-    String runtimeId = runtimeTarget.getRuntimeType().getId();
-    WebServiceClientTypeRegistry wsctRegistry = WebServiceClientTypeRegistry.getInstance();
-    String[] serverFactoryIds = wsctRegistry.getServerFactoryIdsByType(typeId);
-  
-    for (int i=0; i<serverFactoryIds.length; i++)
-    {
-      IServerType serverType = ServerCore.findServerType(serverFactoryIds[i]);
-      if (serverType!=null ){
-      	String serverRuntimeId = serverType.getRuntimeType().getId();
-      	if (serverRuntimeId.equals(runtimeId))
-      	{
-      		return serverFactoryIds[i];
-      	}
-      }
-    }
-    return null;
-  }
-  
-  /*
-   * Return the factory id of the first server type compatible with the runtimeTargets and typeId.
-   * Returns null if there are none.
-   */
-  public static String getFirstSupportedServerType(List runtimeTargets, String typeId)
-  {
-    for (int i=0; i<runtimeTargets.size(); i++ )
-    {
-      IRuntime runtimeTarget = (IRuntime)runtimeTargets.get(i);
-      String factoryId = getFirstSupportedServerType(runtimeTarget, typeId);
-      if (factoryId != null && factoryId.length()>0)
-        return factoryId;
-    }
-    
-    return null;
-  }
-
-  public static IRuntime getRuntimeTarget(String projectName)
-  {
-  	if( projectName != null && projectName.length() > 0 ){ //$NON-NLS-1$
-  		IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
-  		if( project != null && project.exists() ){
-  			return ServerCore.getProjectProperties(project).getRuntimeTarget(); 
-  		}
-  	}
-  	return null;
-  }
-  
-  public static IServer[] getCompatibleExistingServers(IRuntime runtime)
-  {
-    if (runtime == null)
-      return null;
-    
-    IServer[] servers = ServerCore.getServers();
-    if (servers==null || servers.length!=0)
-      return null;
-    
-    ArrayList compatibleServersList = new ArrayList();
-    String runtimeId = runtime.getRuntimeType().getId();
-    for (int i=0; i<servers.length; i++)
-    {
-      IServer server = (IServer)servers[i];
-      String serverRuntimeId = server.getRuntime().getRuntimeType().getId();
-      if (serverRuntimeId.equals(runtimeId))
-        compatibleServersList.add(server);
-      
-    }
-    if (compatibleServersList.size()<1)
-      return null;
-    
-    
-    Object[] compatibleServersArray = compatibleServersList.toArray();
-    IServer[] compatibleServers = new IServer[compatibleServersArray.length];
-    for (int j=0; j<compatibleServersArray.length; j++)
-    {
-      compatibleServers[j] = (IServer)compatibleServersArray[j];
-    }
-    
-    return compatibleServers;
-  }  
-  /*
-   * Returns the factory Id and instance id of the first exiting server compatible
-   * with the runtime targets and typeId
-   * Returns null if there are none.
-   * The item at [0] is the factory id.
-   * The item at [1] is the instance id.
-   */
-  public static String[] getCompatibleExistingServer(List runtimeTargets, String typeId)
-  {
-    String[] serverInfo = new String[2];
-    for (int i=0; i<runtimeTargets.size(); i++ )
-    {
-      IRuntime runtimeTarget = (IRuntime)runtimeTargets.get(i);
-      IServer[] existingCompatServers = getCompatibleExistingServers(runtimeTarget);
-      IServer compatServer = getFirstSupportedServer(existingCompatServers, typeId);
-      if (compatServer != null)
-      {
-        serverInfo[0] = compatServer.getServerType().getId();
-        serverInfo[1] = compatServer.getId();
-        return serverInfo;
-      }
-    }
-    return null;
-  }
-  
-  public static ServerInfo getExtenderRecommendation(IProject project)
-  {
-    try
-    {
-    IExtensionRegistry reg = Platform.getExtensionRegistry();
-    IConfigurationElement[] elements = reg.getConfigurationElementsFor("org.eclipse.jst.ws.consumption", "serverDefaulter");
-    for (int i=0; i<elements.length; i++)
-    {
-      Object serverDefaulterObject = elements[i].createExecutableExtension("class");
-      if (serverDefaulterObject instanceof IServerDefaulter)
-      {
-        IServerDefaulter serverDefaulter = (IServerDefaulter)serverDefaulterObject;
-        ServerInfo serverInfo = serverDefaulter.recommendDefaultServer(project);
-        if (serverInfo != null)
-          return serverInfo;
-      }
-      
-    }
-    } catch (CoreException ce)
-    {
-      return null;
-    }
-    
-    return null;
-  }
-  
-  private static List getRuntimeTargetsSupportedByWSRuntime(List runtimeTargets, String webServiceRuntimeId)
-  {
-    ArrayList suppRuntimeTargets = new ArrayList();
-    WebServiceClientTypeRegistry wsctReg = WebServiceClientTypeRegistry.getInstance();
-    for (int i=0; i<runtimeTargets.size(); i++)
-    {
-      IRuntime runtimeTarget = (IRuntime)runtimeTargets.get(i);
-      String rtId = runtimeTarget.getRuntimeType().getId();
-      if (wsctReg.doesRuntimeSupportServerTarget(rtId, webServiceRuntimeId))
-      {
-        suppRuntimeTargets.add(runtimeTarget);
-      }
-    }
-    return suppRuntimeTargets;
-  }
-
-  /**
-   * Use this method to get a server factory id and instance id that is compatible with the given Web
-   * service runtime.
-   * @param clientRuntimeId
-   * @param j2eeVersion String representation of the int values in J2EEVersionConstants i.e. "12", "13", "14"
-   * @return String[] index [0] contains factoryId, index[1] contains instance Id.
-   */
-  public static String[] getServerFromClientRuntimeAndJ2EE(String clientRuntimeId, String j2eeVersion)
-  {
-    String[] serverInfo = new String[2];
-    WebServiceClientTypeRegistry wsctReg = WebServiceClientTypeRegistry.getInstance();
-    
-    //Get all possible valid servers. If there are none, we can't default intelligently, return null.
-    String[] validServerFactoryIds = wsctReg.getServerFactoryIdsByRuntimeId(clientRuntimeId);
-    if (validServerFactoryIds==null || validServerFactoryIds.length<1)
-      return null;
-    
-    //Get all existing servers
-    IServer[] servers = ServerCore.getServers(); //Get all existing servers
-    
-    //Get the preferred server.
-  	PersistentServerRuntimeContext context = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext();
-  	String prefServerFactoryId = context.getServerFactoryId();
-  	
-    boolean preferredIsValid =  containsString(validServerFactoryIds, prefServerFactoryId)
-                                && isServerValid(prefServerFactoryId, j2eeVersion);
-    if (preferredIsValid)
-    {
-      for (int i=0; i<servers.length; i++)
-      {
-        IServer server = (IServer)servers[i];
-        String thisFactoryId = server.getServerType().getId();
-        
-        if (thisFactoryId.equals(prefServerFactoryId))
-        {
-          serverInfo[0] = prefServerFactoryId;
-          serverInfo[1] = server.getId();
-          return serverInfo;
-        }                
-      }      
-    }
-    
-    //Either the preferred server was not valid or it was valid but does not exist.
-    //Check the existing servers for validity
-    for (int i=0; i<servers.length; i++)
-    {
-      IServer server = (IServer)servers[i];
-      String thisFactoryId = server.getServerType().getId();
-      
-      boolean thisServerValid = containsString(validServerFactoryIds, thisFactoryId) 
-                                && isServerValid(thisFactoryId, j2eeVersion);
-      if (thisServerValid)
-      {
-        serverInfo[0] = thisFactoryId;
-        serverInfo[1] = server.getId();
-        return serverInfo;        
-      }
-    }          
-
-    //None of the existing servers is valid. Pick the preferred one if valid. Otherwise, pick the
-    //first valid server type.
-    if (preferredIsValid)
-    {
-      serverInfo[0] = prefServerFactoryId;
-      return serverInfo;
-    }
-    else
-    {
-      for (int i=0; i<validServerFactoryIds.length; i++ )
-      {
-        boolean isValid = isServerValid(validServerFactoryIds[i], j2eeVersion);
-        if (isValid)
-        {
-          serverInfo[0] = validServerFactoryIds[0];
-          return serverInfo;
-        }
-      }      
-    }
-    
-    //We can't determine a valid server selection. Return null.
-    return null;
-  }
-  
-  private static boolean isServerValid(String serverFactoryId, String j2eeVersion)
-  {
-   if (serverFactoryId==null || serverFactoryId.length()==0 || j2eeVersion==null || j2eeVersion.length()==0)
-     return true;
-   
-   String runtimeTargetId = ServerUtils.getRuntimeTargetIdFromFactoryId(serverFactoryId);
-   if (runtimeTargetId == null || runtimeTargetId.length()==0)
-     return false;
-   String webModuleType = IServerTargetConstants.WEB_TYPE;
-   boolean isValid = ServerUtils.isTargetValidForProjectType(runtimeTargetId, j2eeVersion, webModuleType);
-   return isValid;
-  }
-  /*
-   * Returns true if a contains b, false otherwise.
-   */
-  private static boolean containsString(String[] a, String b)
-  {
-    if (a==null || a.length<0 || b == null || b.length()==0 )
-      return false;
-    
-    for (int i=0; i<a.length; i++)
-    {
-      String s = a[i];
-      if (s.equals(b))
-      {
-        return true;
-      }
-    }
-    return false;
-  }  
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/FinishFragment.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/FinishFragment.java
deleted file mode 100644
index 072dbe8..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/FinishFragment.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
- *******************************************************************************/
-/*
- * Created on May 4, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.ws.internal.consumption.ui.common;
-
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.FinishTestFragment;
-import org.eclipse.wst.command.env.core.fragment.SequenceFragment;
-
-
-/**
- * @author gilberta
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class FinishFragment extends SequenceFragment
-{
-  public FinishFragment()
-  {	
-	add(new FinishTestFragment() );
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/ServerSelectionUtils.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/ServerSelectionUtils.java
deleted file mode 100644
index 54a0aaa..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/ServerSelectionUtils.java
+++ /dev/null
@@ -1,532 +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.consumption.ui.common;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jst.j2ee.internal.servertarget.IServerTargetConstants;
-import org.eclipse.jst.j2ee.internal.servertarget.ServerTargetHelper;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.jst.ws.internal.consumption.common.IServerDefaulter;
-import org.eclipse.jst.ws.internal.consumption.common.ServerInfo;
-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.wizard.WebServiceServerRuntimeTypeRegistry;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.IServerType;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.server.core.ServerUtil;
-
-
-public class ServerSelectionUtils
-{
-  /*
-   * Returns reasonable defaults for server factory id and instance id based on 
-   * an existing project
-   * index [0] contains factoryId, index[1] contains instance Id.
-   * @deprecated
-   */
-  public static String[] getServerInfoFromExistingProject(IProject project, String typeId, boolean askExtenders)
-  {
-    String[] serverInfo = new String[2]; //serverInfp[0] contains factoryId, serverInfo[1] contains instance Id
-
-    // If the project has been added to an existing server, pick that server
-    IServer[] configuredServers = ServerUtil.getServersByModule(ResourceUtils.getModule(project), null);
-    IServer firstSupportedServer = getFirstSupportedServer(configuredServers, typeId );
-    if (firstSupportedServer != null)
-    {
-      serverInfo[0] = firstSupportedServer.getServerType().getId();
-      serverInfo[1] = firstSupportedServer.getId();
-      return serverInfo;
-      	
-    }
-    
-    
-    //Does the project have a runtime-target?
-    IRuntime runtimeTarget = getRuntimeTarget(project.getName());
-    if (runtimeTarget != null)
-    {
-      //Look for an existing server which is compatible with the runtime-target
-      IServer[] compatibleServers = getCompatibleExistingServers(runtimeTarget);
-      if (compatibleServers!=null && compatibleServers.length > 0)
-      {
-        IServer firstSupportedCompatServer = getFirstSupportedServer(compatibleServers, typeId);
-        if (firstSupportedCompatServer != null)
-        {
-          serverInfo[0] = firstSupportedCompatServer.getServerType().getId();
-          serverInfo[1] = firstSupportedCompatServer.getId();
-          return serverInfo;
-          
-        }  
-      }
-      
-      //No existing compatible server was found. Choose a compatible server type.
-      
-      //If the preferred server is compatible with the project's runtime target, use it.
-      PersistentServerRuntimeContext ctx = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext();
-      String pFactoryId = ctx.getServerFactoryId();
-      IServerType serverType = ServerCore.findServerType(pFactoryId);
-      if (serverType!=null){
-      	String serverRuntimeId = serverType.getRuntimeType().getId();
-      	if (serverRuntimeId.equals(runtimeTarget.getRuntimeType().getId()))
-      	{
-      	  serverInfo[0] = pFactoryId;
-      	  return serverInfo;
-      	}
-      }     
-      
-      //The preferred server was not compatible. Pick the first valid compatible server type.
-      String factoryId = getFirstSupportedServerType(runtimeTarget, typeId);
-      if (factoryId != null) serverInfo[0] = factoryId;
-      return serverInfo;
-
-    }
-    
-    if (askExtenders)
-    {
-      ServerInfo recommendedServerInfo = getExtenderRecommendation(project);
-      if (recommendedServerInfo!=null)
-      {
-        if (recommendedServerInfo.getServerFactoryId()!=null && recommendedServerInfo.getServerFactoryId().length()>0)
-          serverInfo[0] = recommendedServerInfo.getServerFactoryId();
-        
-        if (recommendedServerInfo.getServerInstanceId()!=null && recommendedServerInfo.getServerInstanceId().length()>0)
-          serverInfo[1] = recommendedServerInfo.getServerInstanceId(); 
-
-        return serverInfo;
-      }
-
-    }
-    
-    //Use ServerTargetHelper to get a list of valid runtime-targets and use these to determine a default server type.
-    String[] projectAttrs = ServerTargetHelper.getProjectTypeAndJ2EELevel(project);
-    List runtimes = ServerTargetHelper.getServerTargets(projectAttrs[0], projectAttrs[1]);
-    String[] compatServerInfo = getCompatibleExistingServer(runtimes,typeId); 
-    if ( compatServerInfo != null)
-    {
-      return compatServerInfo;
-    }
-    
-    //No existing compatible server, pick a type.
-    String factoryId = getFirstSupportedServerType(runtimes, typeId);
-    if (factoryId != null) serverInfo[0] = factoryId; 
-    return serverInfo;   
-    
-  }
-
-  /*
-   * Returns reasonable defaults for server factory id and instance id based on 
-   * an existing project
-   * index [0] contains factoryId, index[1] contains instance Id.
-   */
-  public static String[] getServerInfoFromExistingProject(IProject project, String typeId, String runtimeId, boolean askExtenders)
-  {
-    String[] serverInfo = new String[2]; //serverInfp[0] contains factoryId, serverInfo[1] contains instance Id
-
-    // If the project has been added to an existing server, pick that server
-    IServer[] configuredServers = ServerUtil.getServersByModule(ResourceUtils.getModule(project), null);
-    IServer firstSupportedServer = getFirstSupportedServer(configuredServers, typeId );
-    if (firstSupportedServer != null)
-    {
-      serverInfo[0] = firstSupportedServer.getServerType().getId();
-      serverInfo[1] = firstSupportedServer.getId();
-      return serverInfo;
-      	
-    }
-    
-    
-    //Does the project have a runtime-target?
-    IRuntime runtimeTarget = getRuntimeTarget(project.getName());
-    if (runtimeTarget != null)
-    {
-      //Look for an existing server which is compatible with the runtime-target
-      IServer[] compatibleServers = getCompatibleExistingServers(runtimeTarget);
-      if (compatibleServers!=null && compatibleServers.length > 0)
-      {
-        IServer firstSupportedCompatServer = getFirstSupportedServer(compatibleServers, typeId);
-        if (firstSupportedCompatServer != null)
-        {
-          serverInfo[0] = firstSupportedCompatServer.getServerType().getId();
-          serverInfo[1] = firstSupportedCompatServer.getId();
-          return serverInfo;
-          
-        }  
-      }
-      
-      //No existing compatible server was found. Choose a compatible server type.
-      
-      //If the preferred server is compatible with the project's runtime target, use it.
-      PersistentServerRuntimeContext ctx = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext();
-      String pFactoryId = ctx.getServerFactoryId();
-      IServerType serverType = ServerCore.findServerType(pFactoryId);
-      if (serverType!=null){
-      	String serverRuntimeId = serverType.getRuntimeType().getId();
-      	if (serverRuntimeId.equals(runtimeTarget.getRuntimeType().getId()))
-      	{
-      	  serverInfo[0] = pFactoryId;
-      	  return serverInfo;
-      	}
-      }     
-      
-      //The preferred server was not compatible. Pick the first valid compatible server type.
-      String factoryId = getFirstSupportedServerType(runtimeTarget, typeId);
-      if (factoryId != null) serverInfo[0] = factoryId;
-      return serverInfo;
-
-    }
-    
-    if (askExtenders)
-    {
-      ServerInfo recommendedServerInfo = getExtenderRecommendation(project);
-      if (recommendedServerInfo!=null)
-      {
-        if (recommendedServerInfo.getServerFactoryId()!=null && recommendedServerInfo.getServerFactoryId().length()>0)
-          serverInfo[0] = recommendedServerInfo.getServerFactoryId();
-        
-        if (recommendedServerInfo.getServerInstanceId()!=null && recommendedServerInfo.getServerInstanceId().length()>0)
-          serverInfo[1] = recommendedServerInfo.getServerInstanceId(); 
-
-        return serverInfo;
-      }
-
-    }
-    
-    //Use ServerTargetHelper to get a list of valid runtime-targets and use these to determine a default server type.
-    String[] projectAttrs = ServerTargetHelper.getProjectTypeAndJ2EELevel(project);
-    List runtimes = ServerTargetHelper.getServerTargets(projectAttrs[0], projectAttrs[1]);
-    List suppRuntimes = getRuntimeTargetsSupportedByWSRuntime(runtimes, runtimeId);
-    String[] compatServerInfo = getCompatibleExistingServer(suppRuntimes,typeId); 
-    if ( compatServerInfo != null)
-    {
-      return compatServerInfo;
-    }
-    
-    //No existing compatible server, pick a type.
-    String factoryId = getFirstSupportedServerType(suppRuntimes, typeId);
-    if (factoryId != null) serverInfo[0] = factoryId; 
-    return serverInfo;   
-    
-  }
-  
-  /*
-   * Given a list of existing servers, this returns the first one that is supported
-   * by the given Web service type id. 
-   * Returns null of there are no supported servers in the array.
-   */
-  public static IServer getFirstSupportedServer(IServer[] servers, String typeId)
-  {
-    WebServiceServerRuntimeTypeRegistry wssrtRegistry = WebServiceServerRuntimeTypeRegistry.getInstance();
-    if (servers != null && servers.length > 0) {
-      for (int i = 0; i < servers.length; i++)
-      {
-        String serverFactoryId = servers[i].getServerType().getId();
-        if (wssrtRegistry.isServerSupportedForChosenType(typeId, serverFactoryId))
-        {
-          return servers[i];
-        }
-      }
-    }
-    return null;
-  }  
-  
-  /*
-   * Returns the factory id of a server type compatible with the Web service type and the runtime target.
-   * Returns null if there are none.
-   */
-  public static String getFirstSupportedServerType(IRuntime runtimeTarget, String typeId)
-  {
-    String runtimeId = runtimeTarget.getRuntimeType().getId();
-    WebServiceServerRuntimeTypeRegistry wssrtRegistry = WebServiceServerRuntimeTypeRegistry.getInstance();
-    String[] serverFactoryIds = wssrtRegistry.getServerFactoryIdsByType(typeId);
-    for (int i=0; i<serverFactoryIds.length; i++)
-    {
-      IServerType serverType = ServerCore.findServerType(serverFactoryIds[i]);
-      if (serverType!=null){
-      	String serverRuntimeId = serverType.getRuntimeType().getId();
-      	if (serverRuntimeId.equals(runtimeId))
-      	{
-      		return serverFactoryIds[i];
-      	}
-      }
-    }
-    return null;
-  }
-  
-  /*
-   * Return the factory id of the first server type compatible with the runtimeTargets and typeId.
-   * Returns null if there are none.
-   */
-  public static String getFirstSupportedServerType(List runtimeTargets, String typeId)
-  {
-    for (int i=0; i<runtimeTargets.size(); i++ )
-    {
-      IRuntime runtimeTarget = (IRuntime)runtimeTargets.get(i);
-      String factoryId = getFirstSupportedServerType(runtimeTarget, typeId);
-      if (factoryId != null && factoryId.length()>0)
-        return factoryId;
-    }
-    
-    return null;
-  }
-
-  public static IRuntime getRuntimeTarget(String projectName)
-  {
-  	if( projectName != null && projectName.length() > 0 ){ //$NON-NLS-1$
-  		IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
-  		if( project != null && project.exists() ){
-  			return ServerCore.getProjectProperties(project).getRuntimeTarget(); 
-  		}
-  	}
-  	return null;
-  }
-  
-  public static IServer getFirstExistingServerFromFactoryId(String factoryId)
-  {
-  	IServer[] servers = ServerCore.getServers();
-  	if (servers==null || servers.length!=0)
-        return null;
-  	else
-  	{
-  	  for (int i=0; i<servers.length; i++)
-  	  {
-  	    IServer server = (IServer)servers[i];
-  	    if (server.getServerType().getId().equals(factoryId))
-  	    {
-  	      return server;
-  	    }
-  	  }
-  	}
-    return null;
-  }
-  
-  public static IServer[] getCompatibleExistingServers(IRuntime runtime)
-  {
-    if (runtime == null)
-      return null;
-    
-    IServer[] servers = ServerCore.getServers();
-    if (servers==null || servers.length!=0)
-      return null;
-    
-    ArrayList compatibleServersList = new ArrayList();
-    String runtimeId = runtime.getRuntimeType().getId();
-    for (int i=0; i<servers.length; i++)
-    {
-      IServer server = (IServer)servers[i];
-      String serverRuntimeId = server.getRuntime().getRuntimeType().getId();
-      if (serverRuntimeId.equals(runtimeId))
-        compatibleServersList.add(server);
-      
-    }
-    if (compatibleServersList.size()<1)
-      return null;
-    
-    
-    Object[] compatibleServersArray = compatibleServersList.toArray();
-    IServer[] compatibleServers = new IServer[compatibleServersArray.length];
-    for (int j=0; j<compatibleServersArray.length; j++)
-    {
-      compatibleServers[j] = (IServer)compatibleServersArray[j];
-    }
-    
-    return compatibleServers;
-  }  
-  /*
-   * Returns the factory Id and instance id of the first exiting server compatible
-   * with the runtime targets and typeId
-   * Returns null if there are none.
-   * The item at [0] is the factory id.
-   * The item at [1] is the instance id.
-   */
-  public static String[] getCompatibleExistingServer(List runtimeTargets, String typeId)
-  {
-    String[] serverInfo = new String[2];
-    for (int i=0; i<runtimeTargets.size(); i++ )
-    {
-      IRuntime runtimeTarget = (IRuntime)runtimeTargets.get(i);
-      IServer[] existingCompatServers = getCompatibleExistingServers(runtimeTarget);
-      IServer compatServer = getFirstSupportedServer(existingCompatServers, typeId);
-      if (compatServer != null)
-      {
-        serverInfo[0] = compatServer.getServerType().getId();
-        serverInfo[1] = compatServer.getId();
-        return serverInfo;
-      }
-    }
-    return null;
-  }
-  
-  public static ServerInfo getExtenderRecommendation(IProject project)
-  {
-    try
-    {
-    IExtensionRegistry reg = Platform.getExtensionRegistry();
-    IConfigurationElement[] elements = reg.getConfigurationElementsFor("org.eclipse.jst.ws.consumption", "serverDefaulter");
-    for (int i=0; i<elements.length; i++)
-    {
-      Object serverDefaulterObject = elements[i].createExecutableExtension("class");
-      if (serverDefaulterObject instanceof IServerDefaulter)
-      {
-        IServerDefaulter serverDefaulter = (IServerDefaulter)serverDefaulterObject;
-        ServerInfo serverInfo = serverDefaulter.recommendDefaultServer(project);
-        if (serverInfo != null)
-          return serverInfo;
-      }
-      
-    }
-    } catch (CoreException ce)
-    {
-      return null;
-    }
-    
-    return null;
-  }
-  
-  private static List getRuntimeTargetsSupportedByWSRuntime(List runtimeTargets, String webServiceRuntimeId)
-  {
-    ArrayList suppRuntimeTargets = new ArrayList();
-    WebServiceServerRuntimeTypeRegistry wssrtReg = WebServiceServerRuntimeTypeRegistry.getInstance();
-    for (int i=0; i<runtimeTargets.size(); i++)
-    {
-      IRuntime runtimeTarget = (IRuntime)runtimeTargets.get(i);
-      String rtId = runtimeTarget.getRuntimeType().getId();
-      if (wssrtReg.doesRuntimeSupportServerTarget(rtId, webServiceRuntimeId));
-      {
-        suppRuntimeTargets.add(runtimeTarget);
-      }
-    }
-    return suppRuntimeTargets;
-  }  
-  
-  /**
-   * Use this method to get a server factory id and instance id that is compatible with the given Web
-   * service runtime.
-   * @param webServiceRuntimeId
-   * @param j2eeVersion String representation of the int values in J2EEVersionConstants i.e. "12", "13", "14"
-   * @return String[] index [0] contains factoryId, index[1] contains instance Id.
-   */
-  public static String[] getServerFromWebServceRuntimeAndJ2EE(String webServiceRuntimeId, String j2eeVersion)
-  {
-    String[] serverInfo = new String[2];
-    WebServiceServerRuntimeTypeRegistry wssrtReg = WebServiceServerRuntimeTypeRegistry.getInstance();
-    
-    //Get all possible valid servers. If there are none, we can't default intelligently, return null.
-    String[] validServerFactoryIds = wssrtReg.getServerFactoryIDByRuntimeID(webServiceRuntimeId);
-    if (validServerFactoryIds==null || validServerFactoryIds.length<1)
-      return null;
-    
-    //Get all existing servers
-    IServer[] servers = ServerCore.getServers(); //Get all existing servers
-    
-    //Get the preferred server.
-  	PersistentServerRuntimeContext context = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext();
-  	String prefServerFactoryId = context.getServerFactoryId();
-  	
-    boolean preferredIsValid =  containsString(validServerFactoryIds, prefServerFactoryId)
-                                && isServerValid(prefServerFactoryId, j2eeVersion);
-    if (preferredIsValid)
-    {
-      for (int i=0; i<servers.length; i++)
-      {
-        IServer server = (IServer)servers[i];
-        String thisFactoryId = server.getServerType().getId();
-        
-        if (thisFactoryId.equals(prefServerFactoryId))
-        {
-          serverInfo[0] = prefServerFactoryId;
-          serverInfo[1] = server.getId();
-          return serverInfo;
-        }                
-      }      
-    }
-    
-    //Either the preferred server was not valid or it was valid but does not exist.
-    //Check the existing servers for validity
-    for (int i=0; i<servers.length; i++)
-    {
-      IServer server = (IServer)servers[i];
-      String thisFactoryId = server.getServerType().getId();
-      
-      boolean thisServerValid = containsString(validServerFactoryIds, thisFactoryId) 
-                                && isServerValid(thisFactoryId, j2eeVersion);
-      if (thisServerValid)
-      {
-        serverInfo[0] = thisFactoryId;
-        serverInfo[1] = server.getId();
-        return serverInfo;        
-      }
-    }          
-
-    //None of the existing servers is valid. Pick the preferred one if valid. Otherwise, pick the
-    //first valid server type.
-    if (preferredIsValid)
-    {
-      serverInfo[0] = prefServerFactoryId;
-      return serverInfo;
-    }
-    else
-    {
-      for (int i=0; i<validServerFactoryIds.length; i++ )
-      {
-        boolean isValid = isServerValid(validServerFactoryIds[i], j2eeVersion);
-        if (isValid)
-        {
-          serverInfo[0] = validServerFactoryIds[0];
-          return serverInfo;
-        }
-      }      
-    }
-    
-    //We can't determine a valid server selection. Return null.
-    return null;
-  }
-  
-  private static boolean isServerValid(String serverFactoryId, String j2eeVersion)
-  {
-   if (serverFactoryId==null || serverFactoryId.length()==0 || j2eeVersion==null || j2eeVersion.length()==0)
-     return true;
-   
-   String runtimeTargetId = ServerUtils.getRuntimeTargetIdFromFactoryId(serverFactoryId);
-   if (runtimeTargetId == null || runtimeTargetId.length()==0)
-     return false;
-   String webModuleType = IServerTargetConstants.WEB_TYPE;
-   boolean isValid = ServerUtils.isTargetValidForProjectType(runtimeTargetId, j2eeVersion, webModuleType);
-   return isValid;
-  }
-  /*
-   * Returns true is a contains b, false otherwise.
-   */
-  private static boolean containsString(String[] a, String b)
-  {
-    if (a==null || a.length<0 || b == null || b.length()==0 )
-      return false;
-    
-    for (int i=0; i<a.length; i++)
-    {
-      String s = a[i];
-      if (s.equals(b))
-      {
-        return true;
-      }
-    }
-    return false;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/ValidationUtils.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/ValidationUtils.java
deleted file mode 100644
index 280b433..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/ValidationUtils.java
+++ /dev/null
@@ -1,364 +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.consumption.ui.common;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.Map;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Port;
-import javax.wsdl.Service;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jst.j2ee.internal.webservices.WebServiceEditModel;
-import org.eclipse.jst.j2ee.internal.webservices.WebServicesManager;
-import org.eclipse.jst.j2ee.webservice.internal.WebServiceConstants;
-import org.eclipse.jst.j2ee.webservice.wsdd.PortComponent;
-import org.eclipse.jst.j2ee.webservice.wsdd.WSDLPort;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServices;
-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.common.StringToIProjectTransformer;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.jst.ws.internal.consumption.ui.wizard.ClientProjectTypeRegistry;
-import org.eclipse.wst.command.env.common.FileResourceUtils;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.command.env.core.selection.SelectionListChoices;
-import org.eclipse.wst.common.componentcore.StructureEdit;
-import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.ws.parser.wsil.WebServicesParser;
-
-/**
- *
- */
-public class ValidationUtils
-{
-  MessageUtils msgUtils;
-
-  /**
-   * 
-   */
-  public ValidationUtils()
-  {
-    String pluginId = WebServiceConsumptionUIPlugin.ID; //"org.eclipse.jst.ws.consumption.ui";
-    msgUtils = new MessageUtils( pluginId + ".plugin", this );
-  }
-  
-  public Status validateProjectTargetAndJ2EE(String projectName, String earName, String serverFactoryId, String j2eeLevel)
-  {
-    IProject p = FileResourceUtils.getWorkspaceRoot().getProject(projectName);
-	IProject earP = null;
-	if (earName!=null && !earName.equalsIgnoreCase("")) {
-    	earP = FileResourceUtils.getWorkspaceRoot().getProject(earName);
-	}
-    Status targetStatus = doesProjectTargetMatchServerType(p, serverFactoryId);
-    if (earP!=null && targetStatus.getSeverity()==Status.OK)
-    {
-      //check the EAR      
-      Status earTargetStatus = doesProjectTargetMatchServerType(earP, serverFactoryId);
-      if(earTargetStatus.getSeverity()==Status.ERROR)
-      {
-        return earTargetStatus;
-      }            
-    }
-    else
-    {
-      return targetStatus;
-    }
-    
-
-    //Validate service side J2EE level    
-    Status j2eeStatus = doesProjectMatchJ2EELevel(p, j2eeLevel);
-    if(earP!=null && j2eeStatus.getSeverity()==Status.OK)
-    {
-      Status earJ2EEStatus = doesProjectMatchJ2EELevel(earP, j2eeLevel);
-      if(earJ2EEStatus.getSeverity()==Status.ERROR)
-      {
-        return earJ2EEStatus;
-      }
-    }
-    else
-    {
-      return j2eeStatus;
-    }
-    
-    return new SimpleStatus("");
-  }
-  
-  private Status doesProjectTargetMatchServerType(IProject p, String serverFactoryId)
-  {
-    if (p!=null && p.exists())
-    {
-		System.out.println("P.getName = "+p.getName());
-      IRuntime projectTarget = ServerSelectionUtils.getRuntimeTarget(p.getName());
-      if (projectTarget!=null)
-      {
-        String projectTargetId = projectTarget.getRuntimeType().getId();
-        String serverTargetId = ServerUtils.getRuntimeTargetIdFromFactoryId(serverFactoryId);
-        if (serverTargetId!=null && serverTargetId.length()>0)
-        {
-          if(!projectTargetId.equals(serverTargetId))
-          { 
-            return new SimpleStatus("",msgUtils.getMessage("MSG_SERVER_TARGET_MISMATCH",new String[]{p.getName()}),Status.ERROR);
-          }
-        }
-      }
-    }
-    return new SimpleStatus("");        
-  }
-
-  private Status doesProjectMatchJ2EELevel(IProject p, String j2eeLevel)
-  {
-	StructureEdit mc = null;
-    try {
-		if (p!=null && p.exists())
-		{
-		  mc = StructureEdit.getStructureEditForRead(p);
-		  WorkbenchComponent[] wbcs = mc.getWorkbenchModules();
-		  
-			
-		  int projectJ2EELevel = J2EEUtils.getJ2EEVersion(p);
-		  if (projectJ2EELevel!=-1)
-		  {
-		    String projectJ2EELevelString = String.valueOf(projectJ2EELevel);
-		    if (j2eeLevel!=null && j2eeLevel.length()>0)
-		    {
-		      if (!projectJ2EELevelString.equals(j2eeLevel))
-		      {
-		        return new SimpleStatus("",msgUtils.getMessage("MSG_J2EE_MISMATCH",new String[]{p.getName()}), Status.ERROR);
-		      }
-		    }
-		  }
-		}
-	} finally {
-		if (mc != null)
-			mc.dispose();
-	}
-    return new SimpleStatus("");        
-  }
-  
-  public Status validateProjectType(String projectName, SelectionListChoices runtime2ClientTypes)
-  {
-    Status status = new SimpleStatus("");
-    IProject p = (IProject)((new StringToIProjectTransformer()).transform(projectName));
-    if (p==null || !p.exists())
-    {
-      //Project does not exist which means a new project of the correct type will be creates
-      //We're done. All is good.
-      return status;
-    }
-      
-    //If the project exists, we should see it in the project list for the selected client
-    //project type.
-    String[] projectNames = runtime2ClientTypes.getChoice().getChoice().getList().getList();
-    for (int i=0; i<projectNames.length; i++)
-    {
-      if (projectName.equals(projectNames[i]))
-      {
-        //Found the project. All is good.
-        return status;
-      }
-    }
-    
-    //Didn't find the project. Return an error.
-    //Get the label for the client type id
-    String clientTypeLabel = getClientTypeLabel(runtime2ClientTypes.getChoice().getList().getSelection());
-    String message = msgUtils.getMessage("MSG_WRONG_CLIENT_PROJECT_TYPE",new String[]{projectName, clientTypeLabel});
-    Status eStatus = new SimpleStatus("",message,Status.ERROR);
-    return eStatus;
-    
-  }
-  
-  private String getClientTypeLabel( String type )
-  {
-    ClientProjectTypeRegistry registry         = ClientProjectTypeRegistry.getInstance();
-    String                    clientTypeLabel  = null;
-    
-    clientTypeLabel = registry.getElementById(type).getAttribute("label");
-    
-    return clientTypeLabel;
-  }  
-  
-  public boolean isProjectServiceProject(IProject p, String wsdlURL, WebServicesParser parser)
-  {
-    if (p==null || wsdlURL==null || wsdlURL.length()==0 || parser==null)
-      return false;
-    
-    IResource wsXML = getWebServcesXML(p);
-    if (wsXML==null)
-      return false;
-    
-    
-      //Make a list of all the wsdl-port's in webservices.xml
-    WebServicesManager wsm = new WebServicesManager();
-    WebServiceEditModel wsEditModel = wsm.getWSEditModel(p);
-    WebServices ws = wsEditModel.getWebServices();
-    Iterator wsDescs = ws.getWebServiceDescriptions().iterator();
-    ArrayList wsdlPortList = new ArrayList();
-    while(wsDescs.hasNext())
-    {
-      WebServiceDescription wsDesc = (WebServiceDescription)wsDescs.next();
-      Iterator pcs = wsDesc.getPortComponents().iterator();
-      while(pcs.hasNext())
-      {
-        PortComponent pc = (PortComponent)pcs.next();
-        WSDLPort wsdlPort = pc.getWsdlPort();
-        wsdlPortList.add(new QualifiedName(wsdlPort.getNamespaceURI(), wsdlPort.getLocalPart()));
-      }
-    }
-    
-    ArrayList portList = getPortNamesFromWsdl(wsdlURL, parser);
-
-    //If any of the QualifiedNames in portList equals any of the QualifiedNames
-    //in wsdlPortList, this is the service project. Return true.
-    Object[] ports = portList.toArray();
-    Object[] wsdlPorts = wsdlPortList.toArray();
-    for (int i = 0; i < ports.length; i++)
-    {
-      QualifiedName portName = (QualifiedName) ports[i];
-      for (int j = 0; j < wsdlPorts.length; j++)
-      {
-        QualifiedName wsdlPortName = (QualifiedName) wsdlPorts[j];
-        if (portName.equals(wsdlPortName))
-        {
-          return true;
-        }
-      }
-    }
-
-    return false;
-  }
-  
-  /*
-   * @deprecated
-   * 
-   */
-  private IResource getWebServcesXML(IProject p)
-  {
-	  // 
-//    J2EENature nature = (J2EENature) J2EENature.getRegisteredRuntime(p);
-//    if (nature == null)
-//      return null;
-
-//    IResource moduleRoot = nature.getModuleServerRoot();
-//	IResource moduleRoot = ResourceUtils.getWebModuleServerRoot(p);
-	IResource moduleRoot = J2EEUtils.getFirstWebContentContainer(p);  
-    if (!(moduleRoot instanceof IContainer))
-      return null;
-
-    IResource webServicesXML=null;
-//    if (nature instanceof J2EEWebNatureRuntime)
-	if (ResourceUtils.isWebProject(p))
-    {
-      StringBuffer wsPath = new StringBuffer();
-      wsPath.append("WEB-INF/");
-      wsPath.append(WebServiceConstants.WEBSERVICE_DD_SHORT_NAME);
-      webServicesXML = ((IContainer)moduleRoot).findMember(wsPath.toString()); 
-    }
-    else //Must be an Application Client Module or an EJB Module
-    {
-      StringBuffer wsPath = new StringBuffer();
-      wsPath.append("META-INF/");
-      wsPath.append(WebServiceConstants.WEBSERVICE_DD_SHORT_NAME);
-      webServicesXML = ((IContainer)moduleRoot).findMember(wsPath.toString());     
-    }
-    
-    return webServicesXML;
-  }
-  
-  private ArrayList getPortNamesFromWsdl(String wsdlURL, WebServicesParser parser)
-  {
-  	ArrayList portNameList = new ArrayList();
-  	Definition def = parser.getWSDLDefinition(wsdlURL);
-    Map services = def.getServices();
-    Service service = null;
-    for (Iterator it = services.values().iterator(); it.hasNext();)
-    {
-      service = (Service)it.next();
-      String namespace = service.getQName().getNamespaceURI();
-      Map ports = service.getPorts();
-      for (Iterator it2 = ports.values().iterator(); it2.hasNext();)
-      {
-      	Port port = (Port)it2.next();
-      	portNameList.add(new QualifiedName(namespace, port.getName()));
-      }
-    }        
-  	
-  	return portNameList;
-  	
-  }
-  
-  private class QualifiedName
-  {
-    String namespaceURI;
-
-    String localPart;
-
-    /**
-     * @param namespaceURI
-     * @param localPart
-     */
-    public QualifiedName(String namespaceURI, String localPart)
-    {
-      super();
-      this.namespaceURI = namespaceURI;
-      this.localPart = localPart;
-    }
-
-    /**
-     * @return Returns the localPart.
-     */
-    public String getLocalPart()
-    {
-      return localPart;
-    }
-
-    /**
-     * @param localPart
-     *          The localPart to set.
-     */
-    public void setLocalPart(String localPart)
-    {
-      this.localPart = localPart;
-    }
-
-    /**
-     * @return Returns the namespaceURI.
-     */
-    public String getNamespaceURI()
-    {
-      return namespaceURI;
-    }
-
-    /**
-     * @param namespaceURI
-     *          The namespaceURI to set.
-     */
-    public void setNamespaceURI(String namespaceURI)
-    {
-      this.namespaceURI = namespaceURI;
-    }
-
-    public boolean equals(QualifiedName qn)
-    {
-      return (qn.getNamespaceURI().equals(namespaceURI) && qn.getLocalPart()
-          .equals(localPart));
-    }
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/ClientRootFragment.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/ClientRootFragment.java
deleted file mode 100644
index 448a68a..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/ClientRootFragment.java
+++ /dev/null
@@ -1,103 +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.consumption.ui.extension;
-
-import org.eclipse.wst.command.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.ws.internal.extensions.AssembleClientFragment;
-import org.eclipse.wst.ws.internal.extensions.DeployClientFragment;
-import org.eclipse.wst.ws.internal.extensions.DevelopClientFragment;
-import org.eclipse.wst.ws.internal.extensions.InstallClientFragment;
-import org.eclipse.wst.ws.internal.extensions.RunClientFragment;
-
-public class ClientRootFragment extends SequenceFragment 
-{
-  public ClientRootFragment()
-  {
-    add( new SimpleFragment( new PreClientDevelopCommand(), "" ) );
-    add( new DevelopClientFragment() );
-    add( new SimpleFragment( new PreClientAssembleCommand(), "" ) );
-    add( new AssembleClientFragment() );
-    add( new SimpleFragment( new PreClientDeployCommand(), "" ) );
-    add( new DeployClientFragment() );
-    add( new SimpleFragment( new PreClientInstallCommand(), "" ) );
-    add( new InstallClientFragment() );
-    add( new SimpleFragment( new PreClientRunCommand(), "" ) );
-    add( new RunClientFragment() );
-  }
-
-  public void registerDataMappings(DataMappingRegistry registry) 
-  {
-  	registry.addMapping( PreClientDevelopCommand.class, "WebService", DevelopClientFragment.class );  
-  	registry.addMapping( PreClientDevelopCommand.class, "Environment", DevelopClientFragment.class );  
-  	registry.addMapping( PreClientDevelopCommand.class, "Context", DevelopClientFragment.class );  
-  	registry.addMapping( PreClientDevelopCommand.class, "Selection", DevelopClientFragment.class );
-    registry.addMapping( PreClientDevelopCommand.class, "Project", DevelopClientFragment.class );
-  	registry.addMapping( PreClientDevelopCommand.class, "Module", DevelopClientFragment.class );  
-    registry.addMapping( PreClientDevelopCommand.class, "EarProject", DevelopClientFragment.class );
-  	registry.addMapping( PreClientDevelopCommand.class, "Ear", DevelopClientFragment.class );
-	
-  	registry.addMapping( PreClientDevelopCommand.class, "WebService", AssembleClientFragment.class );  
-  	registry.addMapping( PreClientDevelopCommand.class, "Environment", AssembleClientFragment.class );  
-  	registry.addMapping( PreClientDevelopCommand.class, "Context", AssembleClientFragment.class );  
-  	registry.addMapping( PreClientDevelopCommand.class, "Selection", AssembleClientFragment.class );
-    registry.addMapping( PreClientDevelopCommand.class, "Project", AssembleClientFragment.class );
-  	registry.addMapping( PreClientDevelopCommand.class, "Module", AssembleClientFragment.class );  
-    registry.addMapping( PreClientDevelopCommand.class, "EarProject", AssembleClientFragment.class );
-  	registry.addMapping( PreClientDevelopCommand.class, "Ear", AssembleClientFragment.class );
-	
-  	registry.addMapping( PreClientDevelopCommand.class, "WebService", DeployClientFragment.class );  
-  	registry.addMapping( PreClientDevelopCommand.class, "Environment", DeployClientFragment.class );  
-  	registry.addMapping( PreClientDevelopCommand.class, "Context", DeployClientFragment.class );  
-  	registry.addMapping( PreClientDevelopCommand.class, "Selection", DeployClientFragment.class );
-    registry.addMapping( PreClientDevelopCommand.class, "Project", DeployClientFragment.class );
-  	registry.addMapping( PreClientDevelopCommand.class, "Module", DeployClientFragment.class );  
-    registry.addMapping( PreClientDevelopCommand.class, "EarProject", DeployClientFragment.class );
-  	registry.addMapping( PreClientDevelopCommand.class, "Ear", DeployClientFragment.class );
-	
-  	registry.addMapping( PreClientDevelopCommand.class, "WebService", InstallClientFragment.class );  
-  	registry.addMapping( PreClientDevelopCommand.class, "Environment", InstallClientFragment.class );  
-  	registry.addMapping( PreClientDevelopCommand.class, "Context", InstallClientFragment.class );  
-  	registry.addMapping( PreClientDevelopCommand.class, "Selection", InstallClientFragment.class );
-    registry.addMapping( PreClientDevelopCommand.class, "Project", InstallClientFragment.class );
-  	registry.addMapping( PreClientDevelopCommand.class, "Module", InstallClientFragment.class );  
-    registry.addMapping( PreClientDevelopCommand.class, "EarProject", InstallClientFragment.class );
-  	registry.addMapping( PreClientDevelopCommand.class, "Ear", InstallClientFragment.class );
-	
-  	registry.addMapping( PreClientDevelopCommand.class, "WebService", RunClientFragment.class );  
-  	registry.addMapping( PreClientDevelopCommand.class, "Environment", RunClientFragment.class );  
-  	registry.addMapping( PreClientDevelopCommand.class, "Context", RunClientFragment.class );  
-  	registry.addMapping( PreClientDevelopCommand.class, "Selection", RunClientFragment.class );  
-    registry.addMapping( PreClientDevelopCommand.class, "Project", RunClientFragment.class );
-  	registry.addMapping( PreClientDevelopCommand.class, "Module", RunClientFragment.class );  
-    registry.addMapping( PreClientDevelopCommand.class, "EarProject", RunClientFragment.class );
-  	registry.addMapping( PreClientDevelopCommand.class, "Ear", RunClientFragment.class );
-    
-    //Mappings from framework to framework commands
-    registry.addMapping( PreClientDevelopCommand.class, "WebService", PreClientAssembleCommand.class );
-    registry.addMapping( PreClientDevelopCommand.class, "Project", PreClientAssembleCommand.class );
-    registry.addMapping( PreClientDevelopCommand.class, "Module", PreClientAssembleCommand.class );
-    registry.addMapping( PreClientDevelopCommand.class, "EarProject", PreClientAssembleCommand.class );
-    registry.addMapping( PreClientDevelopCommand.class, "Ear", PreClientAssembleCommand.class );    
-    registry.addMapping( PreClientDevelopCommand.class, "J2eeLevel", PreClientAssembleCommand.class );
-    
-    registry.addMapping( PreClientDevelopCommand.class, "WebService", PreClientInstallCommand.class );
-    registry.addMapping( PreClientDevelopCommand.class, "Project", PreClientInstallCommand.class );
-    registry.addMapping( PreClientDevelopCommand.class, "Module", PreClientInstallCommand.class );
-    registry.addMapping( PreClientDevelopCommand.class, "EarProject", PreClientInstallCommand.class );
-    registry.addMapping( PreClientDevelopCommand.class, "Ear", PreClientInstallCommand.class );   
-
-    registry.addMapping( PreClientDevelopCommand.class, "WebService", PreClientRunCommand.class );    
-	
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientAssembleCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientAssembleCommand.java
deleted file mode 100644
index 176d989..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientAssembleCommand.java
+++ /dev/null
@@ -1,94 +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.consumption.ui.extension;
-
-import org.eclipse.jst.ws.internal.consumption.command.common.AssociateModuleWithEARCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.CreateModuleCommand;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceClient;
-
-public class PreClientAssembleCommand extends SimpleCommand 
-{
-  private IWebServiceClient       webServiceClient_;
-  private String                  project_;
-  private String                  module_;
-  private String                  earProject_;
-  private String                  ear_;
-  private String                  j2eeLevel_;
-  
-  public Status execute(Environment environment)
-  {
-    System.out.println("In Pre client assemble command.");
-
-    //Create the client EAR module
-    CreateModuleCommand command = new CreateModuleCommand();
-    command.setProjectName(earProject_);
-    command.setModuleName(ear_);
-    command.setModuleType(CreateModuleCommand.EAR);
-    command.setServerFactoryId(webServiceClient_.getWebServiceClientInfo().getServerFactoryId());
-    command.setJ2eeLevel(j2eeLevel_);
-    Status status = command.execute(environment);
-    if (status.getSeverity()==Status.ERROR)
-    {
-      environment.getStatusHandler().reportError(status);
-      return status;
-    }     
-    
-    
-    //Associate the client module and service EAR
-    AssociateModuleWithEARCommand associateCommand = new AssociateModuleWithEARCommand();
-    associateCommand.setProject(project_);
-    associateCommand.setModule(module_);
-    associateCommand.setEARProject(earProject_);
-    associateCommand.setEar(ear_);
-    status = associateCommand.execute(environment);
-    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( IWebServiceClient webServiceClient )
-  {
-    webServiceClient_ = webServiceClient;  
-  }   
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientDeployCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientDeployCommand.java
deleted file mode 100644
index 8ad86ca..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientDeployCommand.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.jst.ws.internal.consumption.ui.extension;
-
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.Status;
-
-public class PreClientDeployCommand extends SimpleCommand 
-{
-  public Status execute(Environment environment) 
-  {
-	System.out.println( "In Pre client deploy command." );
-
-	return super.execute(environment);
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientDevelopCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientDevelopCommand.java
deleted file mode 100644
index 1e9d733..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientDevelopCommand.java
+++ /dev/null
@@ -1,197 +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.consumption.ui.extension;
-
-import org.eclipse.jst.ws.internal.consumption.command.common.CreateModuleCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.selection.SelectionTransformer;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.jst.ws.internal.wsrt.WebServiceRuntimeExtensionUtils;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.command.env.core.context.ResourceContext;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IContext;
-import org.eclipse.wst.ws.internal.provisional.wsrt.ISelection;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceClient;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceRuntime;
-import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceClientInfo;
-import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceScenario;
-import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceState;
-import org.eclipse.wst.ws.internal.wsrt.SimpleContext;
-
-public class PreClientDevelopCommand extends SimpleCommand 
-{
-  private String ID_WEB = "org.eclipse.jst.ws.consumption.ui.clientProjectType.Web";
-  private String ID_EJB = "org.eclipse.jst.ws.consumption.ui.clientProjectType.EJB";
-  private String ID_APP_CLIENT = "org.eclipse.jst.ws.consumption.ui.clientProjectType.AppClient";
-  private String ID_JAVA = "org.eclipse.jst.ws.consumption.ui.clientProjectType.Containerless";
-  
-  private TypeRuntimeServer typeRuntimeServer_;
-  private Environment       environment_;
-  private IContext          context_;
-  private ISelection        selection_;
-  private String            project_;
-  private String            module_;
-  private String            moduleType_;
-  private String            earProject_;
-  private String            ear_;
-  private IWebServiceClient webServiceClient_;
-  private String            j2eeLevel_;
-  private ResourceContext   resourceContext_;
-	private boolean						test_;
-  private String            wsdlURI_;
-
-  public Status execute(Environment environment)
-  {
-    IWebServiceRuntime wsrt = WebServiceRuntimeExtensionUtils
-        .getWebServiceRuntime(typeRuntimeServer_.getRuntimeId());
-    WebServiceClientInfo wsInfo = new WebServiceClientInfo();
-
-    System.out.println("In Pre client develop command.");
-
-    wsInfo.setJ2eeLevel(j2eeLevel_);
-    wsInfo.setServerFactoryId(typeRuntimeServer_.getServerId());
-    wsInfo.setServerInstanceId(typeRuntimeServer_.getServerInstanceId());
-    wsInfo.setState(WebServiceState.UNKNOWN_LITERAL);
-    wsInfo.setWebServiceRuntimeId(typeRuntimeServer_.getRuntimeId());
-    wsInfo.setWsdlURL(wsdlURI_);
-    
-    environment_ = environment;
-    webServiceClient_ = wsrt.getWebServiceClient(wsInfo);
-    WebServiceScenario scenario = WebServiceScenario.CLIENT_LITERAL;
-    context_ = new SimpleContext(true, true, true, true, true, true, test_,
-        false, scenario, resourceContext_.isOverwriteFilesEnabled(),
-        resourceContext_.isCreateFoldersEnabled(), resourceContext_
-            .isCheckoutFilesEnabled());
-
-    // Create the client module
-    CreateModuleCommand command = new CreateModuleCommand();
-    command.setProjectName(project_);
-    command.setModuleName(module_);
-    // rsk todo -- once the clientProjectType extension is gone, determination
-    // of what type of module to create will have to be done.
-    if (moduleType_.equals(ID_WEB)) command.setModuleType(CreateModuleCommand.WEB);
-    if (moduleType_.equals(ID_EJB)) command.setModuleType(CreateModuleCommand.EJB);
-    if (moduleType_.equals(ID_APP_CLIENT)) command.setModuleType(CreateModuleCommand.APPCLIENT);
-    
-    command.setServerFactoryId(typeRuntimeServer_.getServerId());
-    command.setJ2eeLevel(j2eeLevel_);
-    Status status = command.execute(environment);
-
-    if (status.getSeverity() == Status.ERROR)
-    {
-      environment.getStatusHandler().reportError(status);
-    }
-    return status;
-  }
-  
-  public void setClientTypeRuntimeServer( TypeRuntimeServer typeRuntimeServer )
-  {
-	typeRuntimeServer_ = typeRuntimeServer;  
-  }
-  
-  public void setClientJ2EEVersion( String j2eeLevel )
-  {
-	j2eeLevel_ = j2eeLevel;  
-  }
-  
-  public String getJ2eeLevel()
-  {
-    return j2eeLevel_;  
-  }
-  
-  public IWebServiceClient getWebService()
-  {
-	return webServiceClient_;  
-  }
-  
-  public Environment getEnvironment()
-  {
-	return environment_;
-  }
-  
-  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 void setProject( String project )
-  {
-    project_ = project;
-  }
-  
-  public String getModule()
-  {
-    return module_;	  
-  }
-  
-  public void setModule( String module )
-  {
-	module_ = module;
-  }
-  
-  public void setModuleType( String moduleType)
-  {
-    moduleType_ = moduleType;
-  }
-
-  public String getEarProject()
-  {
-    return earProject_;   
-  }
-  
-  public void setEarProject( String earProject )
-  {
-    earProject_ = earProject;
-  }
-  
-  public String getEar()
-  {
-	return ear_;  
-  }
-  
-  public void setEar( String ear )
-  {
-	ear_ = ear;  
-  }
-	
-	public void setTestService(boolean testService)
-	{
-		test_ = testService;
-	}		
-  
-  public void setWsdlURI(String uri)
-  {
-    wsdlURI_ = uri;
-  }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientInstallCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientInstallCommand.java
deleted file mode 100644
index 9bd69b5..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientInstallCommand.java
+++ /dev/null
@@ -1,97 +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.consumption.ui.extension;
-
-import org.eclipse.jst.ws.internal.consumption.command.common.AddModuleToServerCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.CreateServerCommand;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceClient;
-
-public class PreClientInstallCommand extends SimpleCommand 
-{
-  private IWebServiceClient webServiceClient_;
-  private String            project_;
-  private String            module_;
-  private String            earProject_;
-  private String            ear_;
-  
-	  public Status execute(Environment environment) 
-	  {
-      if (webServiceClient_.getWebServiceClientInfo().getServerInstanceId()==null)
-      {
-        CreateServerCommand createServerCommand = new CreateServerCommand();
-        createServerCommand.setServerFactoryid(webServiceClient_.getWebServiceClientInfo().getServerFactoryId());
-        Status createServerStatus = createServerCommand.execute(environment);
-        if (createServerStatus.getSeverity()==Status.OK)
-        {
-          webServiceClient_.getWebServiceClientInfo().setServerInstanceId(createServerCommand.getServerInstanceId());
-        }
-        else
-        {
-          if (createServerStatus.getSeverity()==Status.ERROR)
-          {
-            environment.getStatusHandler().reportError(createServerStatus);
-          }               
-          return createServerStatus;
-        }
-      }
-        
-      
-      
-      AddModuleToServerCommand command = new AddModuleToServerCommand();
-      command.setServerInstanceId(webServiceClient_.getWebServiceClientInfo().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_);       
-      }
-
-      Status status = command.execute(environment);
-      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( IWebServiceClient webServiceClient )
-    {
-      webServiceClient_ = webServiceClient;  
-    }    
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientRunCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientRunCommand.java
deleted file mode 100644
index 97d6447..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientRunCommand.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 Eclipse Public License v1.0
- * which accompanies 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.consumption.ui.extension;
-
-import org.eclipse.jst.ws.internal.consumption.command.common.StartServerCommand;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceClient;
-
-public class PreClientRunCommand extends SimpleCommand 
-{
-  private IWebServiceClient webServiceClient_;
-
-  public Status execute(Environment environment)
-  {
-    System.out.println("In Pre client run command.");
-    StartServerCommand command = new StartServerCommand();
-    command.setServerInstanceId(webServiceClient_.getWebServiceClientInfo().getServerInstanceId());
-    Status status = command.execute(environment);
-    if (status.getSeverity()==Status.ERROR)
-    {
-      environment.getStatusHandler().reportError(status);       
-    }     
-    return status;    
-  }
-
-  public void setWebService( IWebServiceClient webServiceClient )
-  {
-    webServiceClient_ = webServiceClient;  
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/plugin/WebServiceConsumptionUIPlugin.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/plugin/WebServiceConsumptionUIPlugin.java
deleted file mode 100644
index e757446..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/plugin/WebServiceConsumptionUIPlugin.java
+++ /dev/null
@@ -1,153 +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.consumption.ui.plugin;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.text.MessageFormat;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.ws.internal.consumption.ui.preferences.PersistentServerRuntimeContext;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.wst.command.env.core.common.Log;
-import org.eclipse.wst.command.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 WebServiceConsumptionUIPlugin extends AbstractUIPlugin
-{
-  // 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.consumption.ui";
-
-  /**
-  * The reference to the singleton instance of this plugin.
-  */
-  private static WebServiceConsumptionUIPlugin instance_;
-
-  private PersistentServerRuntimeContext serverRuntimeContext_;
-  private Log log_;
-  
-  /**
-  * Constructs a runtime plugin object for this plugin.
-  */
-  public WebServiceConsumptionUIPlugin ()
-  {
-    super();
-    instance_ = this;
-  }
-
-  /**
-  * Returns the singleton instance of this plugin. Equivalent to calling
-  * (WebServiceConsumptionUIPlugin)Platform.getPlugin("org.eclipse.jst.ws.ui");
-  * @return The WebServiceConsumptionUIPlugin singleton.
-  */
-  static public WebServiceConsumptionUIPlugin getInstance ()
-  {
-    return instance_;
-  }
-
- /**
-  * 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.consumption.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;
-    }
-  }
-
-  public String getPluginStateLocation() {
-    return Platform.getPluginStateLocation(this).toOSString();
-  }
-
-  public String getPluginInstallLocation() {
-    try {
-      return Platform.resolve(getBundle().getEntry("/")).getFile();
-    }
-    catch (Exception e) {
-      return null;
-    }
-  }
-
-  
-  public PersistentServerRuntimeContext getServerRuntimeContext() 
-	{
-	  if (serverRuntimeContext_ == null)
-	  	{
-	  		serverRuntimeContext_ = new PersistentServerRuntimeContext();
-	  		serverRuntimeContext_.load();
-	  	}
-	  return serverRuntimeContext_;
-	}  
-  }
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/preferences/PersistentServerRuntimeContext.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/preferences/PersistentServerRuntimeContext.java
deleted file mode 100644
index 00400b3..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/preferences/PersistentServerRuntimeContext.java
+++ /dev/null
@@ -1,131 +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.consumption.ui.preferences;
-
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.wst.command.env.context.PersistentContext;
-
-
-/**
- * 
- */
-public class PersistentServerRuntimeContext extends PersistentContext {
-	
-	private String PREFERENCE_SERVER = "PREFERENCE_SERVER";
-	private String PREFERENCE_RUNTIME = "PREFERENCE_RUNTIME";
-	private String PREFERENCE_J2EE_VERSION = "PREFERENCE_J2EE_VERSION";
-	
-	private String SERVER_FACTORY_ID_DEFAULT = "org.eclipse.jst.server.tomcat.40";
-	private String RUNTIME_ID_DEFAULT = "org.eclipse.jst.ws.runtime.axis11";
-	private String J2EE_VERSION_DEFAULT = "13";
-	
-	public PersistentServerRuntimeContext()
-	{
-		super(WebServiceConsumptionUIPlugin.getInstance());
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.ws.internal.context.Context#load()
-	 */
-	public void load() {
-		//Defaults will be set via the .ini customization. They are hard coded to default values in the
-		//absence of a .ini file.
-		String serverDefault = getDefaultString(PREFERENCE_SERVER);
-		if (serverDefault==null || serverDefault.length()==0)
-		{
-		  setDefault(PREFERENCE_SERVER, SERVER_FACTORY_ID_DEFAULT);
-		}
-
-		String runtimeDefault = getDefaultString(PREFERENCE_RUNTIME);
-		if (runtimeDefault==null || runtimeDefault.length()==0)
-		{
-		  setDefault(PREFERENCE_RUNTIME, RUNTIME_ID_DEFAULT);
-		}
-
-		String j2eeDefault = getDefaultString(PREFERENCE_J2EE_VERSION);
-		if (j2eeDefault==null || j2eeDefault.length()==0)
-		{
-		  setDefault(PREFERENCE_J2EE_VERSION, J2EE_VERSION_DEFAULT);
-		}
-
-				
-	}
-	
-	public String getDefaultServerFactoryId()
-	{
-		return getDefaultString(PREFERENCE_SERVER);
-	}
-
-	public String getDefaultRuntimeId()
-	{
-		return getDefaultString(PREFERENCE_RUNTIME);
-	}
-
-	public String getDefaultJ2EEVersion()
-	{
-		return getDefaultString(PREFERENCE_J2EE_VERSION);
-	}
-
-	public String getServerFactoryId()
-	{
-		String value = getValueAsString(PREFERENCE_SERVER); 
-		/*
-		if (value==null || value.length()==0)
-		{
-			value = SERVER_FACTORY_ID_DEFAULT; 
-			setServerFactoryId(value);
-		}
-		*/
-		return value;
-	}
-	
-	public String getRuntimeId()
-	{
-		String value = getValueAsString(PREFERENCE_RUNTIME);
-		/*
-		if (value==null || value.length()==0)
-		{
-			value = RUNTIME_ID_DEFAULT; 
-			setRuntimeId(value);
-		}
-		*/
-		return value;		
-	}
-	
-	public String getJ2EEVersion()
-	{
-		String value = getValueAsString(PREFERENCE_J2EE_VERSION);
-		/*
-		if (value==null || value.length()==0)
-		{
-			value = J2EE_VERSION_DEFAULT; 
-			setJ2EEVersion(value);
-		}
-		*/
-		return value;		
-	}
-	
-	public void setServerFactoryId(String id)
-	{
-		setValue(PREFERENCE_SERVER,id);
-	}
-	
-	public void setRuntimeId(String id)
-	{
-		setValue(PREFERENCE_RUNTIME, id);
-	}
-	
-	public void setJ2EEVersion(String version)
-	{
-		setValue(PREFERENCE_J2EE_VERSION, version);
-	}
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/preferences/ServerRuntimePreferencePage.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/preferences/ServerRuntimePreferencePage.java
deleted file mode 100644
index d0c2780..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/preferences/ServerRuntimePreferencePage.java
+++ /dev/null
@@ -1,388 +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.consumption.ui.preferences;
-
-import java.util.ArrayList;
-
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.jst.ws.internal.consumption.ui.wizard.WebServiceServerRuntimeTypeRegistry;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-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.Listener;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.selection.SelectionListChoices;
-
-
-/**
- *
- */
-public class ServerRuntimePreferencePage extends PreferencePage implements IWorkbenchPreferencePage, Listener 
-{
-	private String pluginId_= "org.eclipse.jst.ws.consumption.ui";
-	private MessageUtils msgUtils_;
-	
-	/* CONTEXT_ID SRPF0001 for server preference on the server runtime preference page */
-	private String INFOPOP_SRPF_SERVER_PREF = pluginId_ + ".SRPF0001";
-	private Combo server_;
-
-	/* CONTEXT_ID SRPF0002 for runtime preference on the server runtime preference page */
-	private String INFOPOP_SRPF_RUNTIME_PREF = pluginId_ + ".SRPF0002";
-	private Combo runtime_;	
-
-	/* CONTEXT_ID SRPF0003 for J2EE version preference on the server runtime preference page */
-	private String INFOPOP_SRPF_J2EE_PREF = pluginId_ + ".SRPF0003";
-	private Combo j2eeVersion_;
-	
-	SelectionListChoices serverToRuntimeToJ2EE_;
-	
-	public void init(IWorkbench workbench)   { }	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite)
-	 */
-	protected Control createContents(Composite parent) 
-	{
-	  
-	  msgUtils_ = new MessageUtils(pluginId_ + ".plugin", this);
-	  UIUtils uiUtils = new UIUtils(msgUtils_, pluginId_);
-	  
-	  Composite page = new Composite(parent, SWT.NONE);
-	  GridLayout gl = new GridLayout();
-	  gl.numColumns = 2;
-	  page.setLayout(gl);
-	  GridData gd = new GridData(GridData.VERTICAL_ALIGN_FILL | GridData.HORIZONTAL_ALIGN_FILL);
-	  page.setLayoutData(gd);
-	  
-	  server_ = uiUtils.createCombo(page,"LABEL_SERVERS_LIST",
-	  		                        "TOOLTIP_SRPF_COMBO_SERVER",
-									INFOPOP_SRPF_SERVER_PREF,
-									SWT.SINGLE|SWT.BORDER|SWT.READ_ONLY);
-	  
-	  runtime_ = uiUtils.createCombo(page,"LABEL_RUNTIMES_LIST",
-	  		                         "TOOLTIP_SRPF_COMBO_RUNTIME",
-									 INFOPOP_SRPF_RUNTIME_PREF,
-									 SWT.SINGLE|SWT.BORDER|SWT.READ_ONLY);
-	  
-	  j2eeVersion_ = uiUtils.createCombo(page,"LABEL_J2EE_VERSION",
-                                         "TOOLTIP_SRPF_COMBO_J2EE",
-			                             INFOPOP_SRPF_J2EE_PREF,
-			                             SWT.SINGLE|SWT.BORDER|SWT.READ_ONLY);	  
-
-	  initializeValues();
-	  startListening();
-	  return page;
-	}
-
-	private void initializeValues()
-	{
-		PersistentServerRuntimeContext context = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext();
-		serverToRuntimeToJ2EE_ = WebServiceServerRuntimeTypeRegistry.getInstance().getServerToRuntimeToJ2EE();
-
-
-		setServerItems(serverToRuntimeToJ2EE_.getList().getList());
-		String defaultServerText = context.getServerFactoryId();
-		serverToRuntimeToJ2EE_.getList().setSelectionValue(defaultServerText);
-		setServerSelection(defaultServerText);
-		
-		setRuntimeItems(serverToRuntimeToJ2EE_.getChoice().getList().getList());
-		String defaultRuntimeText = context.getRuntimeId();
-		serverToRuntimeToJ2EE_.getChoice().getList().setSelectionValue(defaultRuntimeText);
-		setRuntimeSelection(defaultRuntimeText);
-		
-		setJ2EEItems(serverToRuntimeToJ2EE_.getChoice().getChoice().getList().getList());
-		String defaultJ2EEVersion = context.getJ2EEVersion();
-		serverToRuntimeToJ2EE_.getChoice().getChoice().getList().setSelectionValue(defaultJ2EEVersion);
-		setJ2EESelection(defaultJ2EEVersion);
-		
-	}
-	
-	public void handleEvent(Event event)
-	{
-		if (server_ == event.widget)
-		{
-			handleServerSelected();
-		}
-		else if (runtime_ == event.widget)
-		{
-			handleRuntimeSelected();
-		}
-		else if (j2eeVersion_ == event.widget)
-		{			
-			handleJ2EESelected();
-		}			
-	}
-
-	private void handleServerSelected()
-	{
-		stopListening();
-		
-		String selectedText = getServerSelection();
-		serverToRuntimeToJ2EE_.getList().setSelectionValue(selectedText);
-		
-		//Update the runtime -------------------------------
-		setRuntimeItems(serverToRuntimeToJ2EE_.getChoice().getList().getList());
-		if (serverToRuntimeToJ2EE_.getChoice().getList().getList().length > 0)
-		  serverToRuntimeToJ2EE_.getChoice().getList().setIndex(0);
-		
-		String newRuntimeText = serverToRuntimeToJ2EE_.getChoice().getList().getSelection();
-		if (newRuntimeText!=null && newRuntimeText.length()>0)
-			setRuntimeSelection(newRuntimeText);
-		
-		//Update the j2ee version -------------------------------
-		if (newRuntimeText!=null && newRuntimeText.length()>0)
-		{
-		  setJ2EEItems(serverToRuntimeToJ2EE_.getChoice().getChoice().getList().getList());
-		  if (serverToRuntimeToJ2EE_.getChoice().getChoice().getList().getList().length > 0)
-			  serverToRuntimeToJ2EE_.getChoice().getChoice().getList().setIndex(0);
-			
-			String newJ2EEText = serverToRuntimeToJ2EE_.getChoice().getChoice().getList().getSelection();
-			if (newJ2EEText!=null && newJ2EEText.length()>0)
-				setJ2EESelection(newJ2EEText);
-		}
-		else
-		{
-		  setJ2EEItems(new String[0]);
-		}
-		
-		startListening();
-	}
-	
-	private void handleRuntimeSelected()
-	{
-		stopListening();
-		
-		String selectedText = getRuntimeSelection();
-		serverToRuntimeToJ2EE_.getChoice().getList().setSelectionValue(selectedText);
-		
-		//Update the j2ee version -------------------------------
-		setJ2EEItems(serverToRuntimeToJ2EE_.getChoice().getChoice().getList().getList());
-		if (serverToRuntimeToJ2EE_.getChoice().getChoice().getList().getList().length > 0)
-		  serverToRuntimeToJ2EE_.getChoice().getChoice().getList().setIndex(0);
-		
-		String newJ2EEText = serverToRuntimeToJ2EE_.getChoice().getChoice().getList().getSelection();
-		if (newJ2EEText!=null && newJ2EEText.length()>0)
-			setJ2EESelection(newJ2EEText);
-				
-		startListening();		
-	}
-	
-	private void handleJ2EESelected()
-	{
-		stopListening();
-		
-		String selectedText = getJ2EESelection();
-		serverToRuntimeToJ2EE_.getChoice().getChoice().getList().setSelectionValue(selectedText);
-		
-		startListening();
-	}
-    /**
-	 * Does anything necessary because the default button has been pressed.
-	*/
-	protected void performDefaults()
-	{
-	  super.performDefaults();
-	  setToDefaults();
-	}
-	
-	private void setToDefaults()
-	{
-		PersistentServerRuntimeContext context = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext();
-
-		String defaultServerText = context.getDefaultServerFactoryId();
-		serverToRuntimeToJ2EE_.getList().setSelectionValue(defaultServerText);
-		setServerSelection(defaultServerText);
-		
-		setRuntimeItems(serverToRuntimeToJ2EE_.getChoice().getList().getList());
-		String defaultRuntimeText = context.getDefaultRuntimeId();
-		serverToRuntimeToJ2EE_.getChoice().getList().setSelectionValue(defaultRuntimeText);
-		setRuntimeSelection(defaultRuntimeText);
-		
-		setJ2EEItems(serverToRuntimeToJ2EE_.getChoice().getChoice().getList().getList());
-		String defaultJ2EEVersion = context.getDefaultJ2EEVersion();
-		serverToRuntimeToJ2EE_.getChoice().getChoice().getList().setSelectionValue(defaultJ2EEVersion);
-		setJ2EESelection(defaultJ2EEVersion);		
-	}
-
-	/**
-	 * 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()
-	{
-      PersistentServerRuntimeContext context = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext();
-      context.setServerFactoryId(getServerSelection());
-      context.setRuntimeId(getRuntimeSelection());
-      context.setJ2EEVersion(getJ2EESelection());
-	}
-	
-	protected void performApply()
-	{
-	  performOk();
-	}
-	
-  	
-	private void startListening()
-	{
-	  server_.addListener(SWT.Selection,this);
-	  runtime_.addListener(SWT.Selection,this);
-	  j2eeVersion_.addListener(SWT.Selection,this);
-	}
-
-	private void stopListening()
-	{
-	  server_.removeListener(SWT.Selection, this);
-	  runtime_.removeListener(SWT.Selection, this);
-	  j2eeVersion_.removeListener(SWT.Selection, this);
-	}
-
-	private void setServerItems(String[] factoryIds)
-	{
-	  
-	  if (factoryIds != null)
-	  {
-		//String[] serverLabels = new String[factoryIds.length];
-	    ArrayList serverLabelsList = new ArrayList();
-		for (int i=0;i<factoryIds.length;i++)
-		{
-			String thisFactoryId = factoryIds[i];
-			String thisServerLabel = WebServiceServerRuntimeTypeRegistry.getInstance().getServerLabel(factoryIds[i]);
-			if (thisServerLabel!=null && thisServerLabel.length()>0)
-			{
-			  serverLabelsList.add(thisServerLabel);
-			}
-			
-		}
-		String[] serverLabels = convertToStringArray(serverLabelsList.toArray()); 
-		server_.setItems(serverLabels);
-	  }
-		
-	}
-	
-	private void setRuntimeItems(String[] ids)
-	{
-	  if (ids != null)
-	  {
-		String[] runtimeLabels = new String[ids.length];
-		for (int i=0;i<ids.length;i++)
-		{
-		  runtimeLabels[i] = WebServiceServerRuntimeTypeRegistry.getInstance().getRuntimeLabel(ids[i]);
-		}
-		runtime_.setItems(runtimeLabels);
-	  }
-		
-	}
-	
-    private void setJ2EEItems(String[] versions)
-    {
-      if (versions != null)
-      {
-        String[] j2eeLabels = new String[versions.length];
-        for (int i = 0; i < versions.length; i++)
-        {
-          String label = J2EEUtils.getLabelFromJ2EEVersion(versions[i]);
-          if (label != null && label.length()>0)
-            j2eeLabels[i] = label;
-          else
-            j2eeLabels[i] = msgUtils_.getMessage("LABEL_NA");
-        }
-        j2eeVersion_.setItems(j2eeLabels);
-        
-        //Disable the combo if it has no items.
-        if (j2eeLabels.length > 0)
-          j2eeVersion_.setEnabled(true);
-        else
-          j2eeVersion_.setEnabled(false);
-      }
-        
-    }
-	
-	private String getServerSelection()
-	{
-	  String serverLabel = server_.getText();
-	  return WebServiceServerRuntimeTypeRegistry.getInstance().getServerFactoryId(serverLabel);		
-	}
-	
-	private String getRuntimeSelection()
-	{
-      String runtimeLabel = runtime_.getText();
-	  return WebServiceServerRuntimeTypeRegistry.getInstance().getRuntimeId(runtimeLabel);				
-	}
-	
-	private String getJ2EESelection()
-	{
-	  String j2eeLabel = j2eeVersion_.getText();
-	  return J2EEUtils.getJ2EEVersionFromLabel(j2eeLabel);		
-	}
-	
-	private void setServerSelection(String factoryId)
-	{
-		String label = WebServiceServerRuntimeTypeRegistry.getInstance().getServerLabel(factoryId);
-		setSelection(server_,label);
-	}
-	
-	private void setRuntimeSelection(String id)
-	{
-		String label = WebServiceServerRuntimeTypeRegistry.getInstance().getRuntimeLabel(id);
-		setSelection(runtime_,label);		
-	}
-	
-	private void setJ2EESelection(String version)
-	{
-	  String label = J2EEUtils.getLabelFromJ2EEVersion(version);
-      setSelection(j2eeVersion_, label);
-	}
-	
-	private void setSelection(Combo combo, String s)
-	{
-		String[] items = combo.getItems();
-		for (int i=0; i<items.length; i++)
-		{
-			if (items[i].equals(s))
-			{
-				combo.select(i);
-				return;
-			}
-		}
-	}
-	
-	private String[] convertToStringArray(Object[] a)
-	{
-	  if (a==null) return new String[0];
-	  	
-	  int length = a.length;
-	  String[] sa = new String[length];
-	  for (int i=0; i<length; i++)
-	  {
-	  	Object obj = a[i];
-	  	if (obj instanceof String)
-	  	{
-	      sa[i] = (String)obj;
-	  	}
-	  }
-	  return sa;
-	}	
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/selection/SelectionTransformer.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/selection/SelectionTransformer.java
deleted file mode 100644
index c39bf8b..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/selection/SelectionTransformer.java
+++ /dev/null
@@ -1,29 +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.consumption.ui.selection;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.wsrt.Selection;
-import org.eclipse.wst.command.env.core.data.Transformer;
-
-public class SelectionTransformer implements Transformer 
-{
-  public Object transform(Object value) 
-  {
-	IStructuredSelection inSelection  = (IStructuredSelection)value;
-	Selection            outSelection = new Selection();
-	
-	outSelection.setSelection( inSelection.toArray() );
-	
-	return outSelection;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/AbstractHandlersWidgetDefaultingCmd.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/AbstractHandlersWidgetDefaultingCmd.java
deleted file mode 100644
index 0bc9d46..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/AbstractHandlersWidgetDefaultingCmd.java
+++ /dev/null
@@ -1,106 +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.consumption.ui.widgets;
-
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.internal.webservices.WebServiceEditModel;
-import org.eclipse.jst.j2ee.internal.webservices.WebServicesManager;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-
-
-/**
- * AbstractHandlersWidgetDefaultingCmd
- *
- * Initialize and load the handlers data
- */
-public abstract class AbstractHandlersWidgetDefaultingCmd extends SimpleCommand {
-  
-  private IStructuredSelection initialSelection_; 
-  private IProject project_;
-  
-  public Status execute(Environment env){
-    String       pluginId = "org.eclipse.jst.ws.consumption.ui";
-    MessageUtils msgUtils_ = new MessageUtils( pluginId + ".plugin", this );    
-    Status status = new SimpleStatus("");
-    
-    IStructuredSelection selection = initialSelection_;
-    if (selection == null) {
-      status = new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_TASK_EXCEPTED"), Status.ERROR, null);
-      env.getStatusHandler().reportError(status);
-      return status;         
-    }
-    
-    
-    return status;
-    
-  }
-  
-
-  public List getClientHandlers(){
-    return null;
-  }
-
-  public void setInitialSelection(IStructuredSelection initSelection){
-    this.initialSelection_ = initSelection;
-  }
-  
-  public IStructuredSelection getInitialSelection(){
-    return this.initialSelection_;
-  }
-  
-  protected IResource getResourceFromInitialSelection()
-  {
-    if (initialSelection_ != null && initialSelection_.size() == 1)
-    {
-      Object obj = initialSelection_.getFirstElement();
-      if (obj != null) 
-      {
-        try
-        { 
-          IResource resource = ResourceUtils.getResourceFromSelection(obj);
-          return resource;
-        } catch(CoreException e)
-        {
-          return null;
-        }        
-      }
-    }
-    return null;
-  }   
- 
-  public IProject getProject(){
-    
-    IResource resource = getResourceFromInitialSelection();
-	if (resource != null)
-	{
-	  return ResourceUtils.getProjectOf( resource.getFullPath() );
-	}
-	 
-	return null;
-  }
-  
-  public WebServiceEditModel getWebServiceEditModel() {
-    WebServicesManager wsm = new WebServicesManager();
-    IProject project = getProject();
-    return wsm.getWSEditModel(project);    
-  }
-  
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/AddHandlerDialog.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/AddHandlerDialog.java
deleted file mode 100644
index 5e0d9df..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/AddHandlerDialog.java
+++ /dev/null
@@ -1,268 +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 May 12, 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.consumption.ui.widgets;
-
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.jst.ws.internal.ui.dialog.DialogUtils;
-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.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.Text;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-
-
-
-public class AddHandlerDialog extends Dialog implements Listener {
-
-  private String pluginId_ = "org.eclipse.jst.ws.consumption.ui";
-  private MessageUtils msgUtils_;
-  private boolean validateOn_;
-  private boolean isClient_;
-  private String className;
-  private String name;
-  private String[] portNames;
-  private String selectedPortName;
-  
-  private Text classNameText;
-  private Text nameText;
-  private Combo portNameCombo;
-  
-  // ----TOOLTIPS Section----
-  /* CONTEXT_ID AHDL0001 for the Handler Config Page */
-  private final String INFOPOP_TEXT_HANDLER_NAME  = "AHDL0001"; //$NON-NLS-1$
-  private final String TOOLTIP_TEXT_HANDLER_NAME = "TOOLTIP_TEXT_HANDLER_NAME";
-  
-  /* CONTEXT_ID AHDL0002 for the Handler Config Page */
-  private final String INFOPOP_TEXT_HANDLER_CLASS  = "AHDL0002"; //$NON-NLS-1$
-  private final String TOOLTIP_TEXT_HANDLER_CLASS = "TOOLTIP_TEXT_HANDLER_CLASS";
-  
-  /* CONTEXT_ID AHDL0001 for the Handler Config Page */
-  private final String INFOPOP_TEXT_HANDLER_PORT  = "AHDL0003"; //$NON-NLS-1$
-  private final String TOOLTIP_TEXT_HANDLER_PORT = "TOOLTIP_TEXT_HANDLER_PORT";
-    
-  private Button beanClassBrowseButton_;
-  /*CONTEXT_ID PBCL0003 for the Bean Class Browse button of the Bean Selection Page*/
-  private String INFOPOP_PBCL_BUTTON_BEAN_CLASS_BROWSE = "PBCL0003";
-  
-  public AddHandlerDialog( Shell shell, boolean isClientHandler)
-  {
-    super(shell);
-    isClient_ = isClientHandler;
-  }
-
-  protected Control createContents(Composite parent) {
-    Composite comp = (Composite) super.createContents(parent);
-    parent.getShell().pack();
-    return comp;
-  }
-
-  protected Control createDialogArea(Composite parent) {
-    validateOn_ = false;
-    msgUtils_ = new MessageUtils(WebServiceConsumptionUIPlugin.ID + ".plugin", this);
-    UIUtils uiUtils = new UIUtils(msgUtils_, pluginId_);
-    
-    Shell thisShell = parent.getShell();
-    if (thisShell == null) {
-      thisShell = createShell();
-    }
-    thisShell.setText(msgUtils_.getMessage("DIALOG_TITLE_WS_ADD_HANDLER"));
-    
-    Composite composite = (Composite) super.createDialogArea(parent);    
-    
-    Composite sourceLocationComp = uiUtils.createComposite(composite, 3);
-    
-    classNameText = uiUtils.createText(sourceLocationComp, "LABEL_TEXT_HANDLER_CLASS", TOOLTIP_TEXT_HANDLER_CLASS, INFOPOP_TEXT_HANDLER_CLASS, SWT.SINGLE | SWT.BORDER);
-    classNameText.addListener(SWT.Modify,this);
-    
-    beanClassBrowseButton_ = uiUtils.createPushButton( sourceLocationComp, "BUTTON_BROWSE_CLASSES",
-                                                       "TOOLTIP_PBCL_BUTTON_BEAN_CLASS_BROWSE",
-                                                       INFOPOP_PBCL_BUTTON_BEAN_CLASS_BROWSE );
-    beanClassBrowseButton_.addSelectionListener( new SelectionAdapter()
-        {
-          public void widgetSelected( SelectionEvent evt )
-          {
-            handleBrowseClasses();  
-          }
-        } );
-    
-    nameText = uiUtils.createText(sourceLocationComp, "LABEL_TEXT_HANDLER_NAME", TOOLTIP_TEXT_HANDLER_NAME, INFOPOP_TEXT_HANDLER_NAME, SWT.SINGLE | SWT.BORDER );
-    nameText.addListener(SWT.Modify, this);
-    
-    // dummy label for column 3.
-    new Label( sourceLocationComp, SWT.NONE );
-    
-    if (!isClient_){
-      portNameCombo = uiUtils.createCombo(sourceLocationComp, "LABEL_TEXT_HANDLER_PORT", TOOLTIP_TEXT_HANDLER_PORT, INFOPOP_TEXT_HANDLER_PORT, SWT.SINGLE | SWT.BORDER );
-      portNameCombo.addListener(SWT.Modify, this);
-      
-      // dummy label for column 3.
-      new Label( sourceLocationComp, SWT.NONE );
-    }
-    validateOn_ = true;
-   return composite;
-  }
-  
-  private void handleBrowseClasses()
-  {
-    Shell shell = getShell();
-    IType itype = DialogUtils.browseClassesAsIType(shell, ResourcesPlugin.getWorkspace().getRoot().getProjects(), new ProgressMonitorDialog(shell));
-    
-    if( itype != null )
-    {
-      classNameText.setText(itype.getFullyQualifiedName());      
-    }
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event)
-   */
-  public void handleEvent(Event event) {
-    if (!validateOn_)
-      return;
-    if (classNameText == event.widget) {
-      handleClassNameTextEvent();
-      validateTextFieldEntries();
-      return;
-    }
-    if (nameText == event.widget) {
-      handleNameTextEvent();
-      validateTextFieldEntries();      
-      return;
-    }
-    if (portNameCombo == event.widget) {
-      handlePortNameTextEvent();
-      validateTextFieldEntries();      
-      return;
-    }    
-  }
-
-  private void handleClassNameTextEvent(){
-    className = classNameText.getText();
-    if (className.lastIndexOf(".java") != -1){
-      nameText.setText(className.substring(0, className.lastIndexOf(".java")));
-    }
-    else {
-      nameText.setText(className);
-    }
-    
-    if (className.lastIndexOf(".") != -1){
-      nameText.setText(className.substring(className.lastIndexOf(".")+1, className.length()));
-    }
-    name = nameText.getText();
-  }
-  
-  private void handleNameTextEvent() {
-   name = nameText.getText(); 
-
-  }
-  
-  private void handlePortNameTextEvent(){
-    selectedPortName = portNameCombo.getText();
-  }
-  
-  private void disableOKButton() {
-    if (getButton(0) != null)
-      getButton(0).setEnabled(false);
-  }
-
-  private void enableOKButton() {
-    if (getButton(0) != null)
-      getButton(0).setEnabled(true);
-  }
-  
-  private void validateTextFieldEntries(){
-  	if (classNameText.getText().equals("")){
-  		disableOKButton();
-  		return;
-  	}
-  	if (nameText.getText().equals("")){
-  		disableOKButton();
-  		return;
-  	}
-  	if (!isClient_){
-  		if (portNameCombo.getText()!=null && portNameCombo.getText().equals("")){
-  			disableOKButton();
-  			return;
-  		}
-  		else if (portNameCombo.getText()==null) {
-  			disableOKButton();
-  			return;
-  		}
-  	}
-  	
-  	enableOKButton();
-  	
-	
-  }
-  
-  /**
-   * @return Returns the className.
-   */
-  public String getClassName() {
-    if (className.lastIndexOf(".java") != -1){
-      return className.substring(0, className.lastIndexOf(".java"));
-    }
-    else {
-      return className;
-    }
-  }
-  /**
-   * @param className The className to set.
-   */
-  public void setClassName(String className) {
-    this.className = className;
-  }
-  /**
-   * @return Returns the name.
-   */
-  public String getName() {
-    return name;
-  }
-  /**
-   * @param name The name to set.
-   */
-  public void setName(String name) {
-    this.name = name;
-  }
-  /**
-   * @return Returns the portName.
-   */
-  public String getPortName() {
-    return selectedPortName;
-  }
-  /**
-   * @param portName The portName to set.
-   */
-  public void setPortNames(String[] portNames) {
-    this.portNames = portNames;
-    portNameCombo.setItems(portNames);
-    portNameCombo.select(0);
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientHandlersWidgetDefaultingCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientHandlersWidgetDefaultingCommand.java
deleted file mode 100644
index 8ad453e..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientHandlersWidgetDefaultingCommand.java
+++ /dev/null
@@ -1,254 +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.consumption.ui.widgets;
-
-import java.util.Collection;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.applicationclient.internal.creation.ApplicationClientNatureRuntime;
-import org.eclipse.jst.j2ee.client.ApplicationClient;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.internal.ejb.project.EJBNatureRuntime;
-import org.eclipse.jst.j2ee.internal.web.operations.J2EEWebNatureRuntime;
-import org.eclipse.jst.j2ee.internal.webservice.WebServiceNavigatorGroupType;
-import org.eclipse.jst.j2ee.internal.webservices.WebServiceEditModel;
-import org.eclipse.jst.j2ee.internal.webservices.WebServicesManager;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.j2ee.webservice.wsclient.Handler;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.j2ee.webservice.wsclient.WebServicesResource;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.HandlerTableItem;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-
-/**
- * ClientHandlersWidgetDefaultingCommand
- *
- * Initialize and load the handlers data
- */
-public class ClientHandlersWidgetDefaultingCommand extends AbstractHandlersWidgetDefaultingCmd {
-
-  private HandlerTableItem[] handlers_;
-
-  private MessageUtils msgUtils_;
-
-  private boolean isGenSkeletonEnabled_;
-
-  private IPath sourceOutputLocation_;
-
-  private Hashtable wsRefsToHandlersTable_;
-
-  private Hashtable refNameToServiceRefObj_;
-
-  private WebServiceEditModel wsEditModel_;
-
-  private WebServicesManager webServicesManager_;
-
-  private IProject project_;
-
-  private WebServicesResource wsClientRes_;
-
-  private String serviceRefName_ = null;
-  
-  private Collection wsServiceRefs_;
-  
-  public Status execute(Environment env) {
-    String pluginId = "org.eclipse.jst.ws.consumption.ui";
-    MessageUtils msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-    Status status = new SimpleStatus("");
-
-    webServicesManager_ = new WebServicesManager();
-
-    IStructuredSelection selection = getInitialSelection();
-    if (selection == null) {
-      status = new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_TASK_EXCEPTED"), Status.ERROR, null);
-      env.getStatusHandler().reportError(status);
-      return status;
-    }
-
-    status = processHandlers();
-    return status;
-
-  }
-
-  public Status processHandlers() {
-    try {
-      Vector handlers = new Vector();
-      wsRefsToHandlersTable_ = new Hashtable();
-      refNameToServiceRefObj_ = new Hashtable();
-
-      wsEditModel_ = getWebServiceEditModel();
-
-      wsServiceRefs_ = getWSServiceRefsFromSelection();
-
-      if (wsServiceRefs_ != null) {
-        Iterator wsRefsIter = wsServiceRefs_.iterator();
-        for (int i = 0; i < wsServiceRefs_.size(); i++) {
-
-          ServiceRef wsServiceRef = (ServiceRef) wsRefsIter.next();
-
-          List wsHandlers = wsServiceRef.getHandlers();
-          HandlerTableItem[] handlerItems = new HandlerTableItem[wsHandlers.size()];
-          for (int k = 0; k < wsHandlers.size(); k++) {
-
-            Handler wsHandler = (Handler) wsHandlers.get(k);
-
-            HandlerTableItem handlerItem = new HandlerTableItem();
-            handlerItem.setHandler(wsHandler);
-            handlerItem.setHandlerName(wsHandler.getHandlerName());
-            handlerItem.setHandlerClassName(wsHandler.getHandlerClass().getQualifiedName());
-            handlerItem.setWsDescRef(wsServiceRef);
-            handlerItems[k] = handlerItem;
-            handlers.add(handlerItem);
-          }
-          String wsServiceRefName = wsServiceRef.getServiceRefName();
-          wsRefsToHandlersTable_.put(wsServiceRefName, handlerItems);
-          refNameToServiceRefObj_.put(wsServiceRefName, wsServiceRef);
-
-        }
-
-        handlers_ = (HandlerTableItem[]) handlers.toArray(new HandlerTableItem[0]);
-      }
-    }
-    catch (Exception e) {
-      return new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_TASK_EXCEPTED"), Status.ERROR, e);
-    }
-    return new SimpleStatus("");
-  }
-
-  public HandlerTableItem[] getAllHandlers() {
-    return this.handlers_;
-  }
-
-  public Hashtable getHandlers() {
-    return wsRefsToHandlersTable_;
-  }
-
-  /**
-   * @return Returns the isGenSkeletonEnabled_.
-   */
-  public boolean getGenSkeletonEnabled() {
-    return true;
-  }
-
-  /**
-   * @return Returns the sourceOutputLocation_.
-   */
-  public IPath[] getSourceOutputLocation() {
-    IPath[] locations = null;
-    if (project_==null)
-     project_ = getProject();
-    if (project_ != null) {
-      locations = ResourceUtils.getAllJavaSourceLocations(project_);
-    }
-
-    return locations;
-  }
-
-  /**
-   * @return Returns the wsEditModel.
-   */
-  public WebServiceEditModel getWsEditModel() {
-    return wsEditModel_;
-  }
-
-  public String getServiceRefName() {
-    return this.serviceRefName_;
-  }
-
-  public WebServicesResource getWsClientResource() {
-    return wsClientRes_;
-  }
-
-  public IProject getClientProject() {
-    return project_;
-  }
-
-  private Collection getWSServiceRefsFromSelection() {
-
-    IStructuredSelection initSel = getInitialSelection();
-    if (initSel != null && initSel.size() == 1) {
-      Object obj = initSel.getFirstElement();
-      ServiceRef serviceRef = null;
-      if (obj instanceof ServiceRef) {
-        // Client ServiceRef
-        serviceRef = (ServiceRef) obj;
-        serviceRefName_ = serviceRef.getServiceRefName();
-        project_ = ProjectUtilities.getProject(serviceRef);
-      }
-      else if (obj instanceof WebServiceNavigatorGroupType) {
-        WebServiceNavigatorGroupType wsngt = (WebServiceNavigatorGroupType) obj;
-        serviceRef = wsngt.getServiceRef();
-        serviceRefName_ = serviceRef.getServiceRefName();
-        project_ = ProjectUtilities.getProject(serviceRef);
-      }
-
-      if (project_==null){
-        project_ = getProject();
-      }
-      if (project_==null){
-        return null;
-      }
-
-      wsClientRes_ = webServicesManager_.getWebServicesClientResource(project_);
-  
-      if (ResourceUtils.isWebProject(project_)) {
-        J2EEWebNatureRuntime rt = J2EEWebNatureRuntime.getRuntime(project_);
-        if (rt != null) {
-          WebApp webApp = rt.getWebApp();
-          if (webApp != null) {
-            return webServicesManager_.getServiceRefs(webApp);
-          }
-        }
-      }
-      else if (ResourceUtils.isAppClientProject(project_)){
-        ApplicationClientNatureRuntime rt = ApplicationClientNatureRuntime.getRuntime(project_);
-        if (rt!=null) {
-          ApplicationClient appClient = rt.getApplicationClient();
-          if (appClient != null){
-            return webServicesManager_.getServiceRefs(appClient);
-          }
-        }
-      }
-      else if (ResourceUtils.isEJBProject(project_)){
-        EJBNatureRuntime rt = EJBNatureRuntime.getRuntime(project_);
-        if(rt!=null){
-          EJBJar ejbJar = rt.getEJBJar();
-          if (ejbJar !=null){
-            return webServicesManager_.getServiceRefs(ejbJar);
-          }
-        }
-      }
-
-    
-    }
-    return null;
-  }
-
-  public Hashtable getRefNameToServiceRef() {
-    return this.refNameToServiceRefObj_;
-  }
-  
-  public Collection getWsServiceRefs(){
-    return this.wsServiceRefs_;
-  }
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientHandlersWidgetOutputCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientHandlersWidgetOutputCommand.java
deleted file mode 100644
index 4102eb2..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientHandlersWidgetOutputCommand.java
+++ /dev/null
@@ -1,231 +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.consumption.ui.widgets;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jem.internal.plugin.JavaEMFNature;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.impl.JavaClassImpl;
-import org.eclipse.jst.j2ee.applicationclient.internal.creation.ApplicationClientNatureRuntime;
-import org.eclipse.jst.j2ee.internal.J2EEEditModel;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.ejb.project.EJBNatureRuntime;
-import org.eclipse.jst.j2ee.internal.web.operations.J2EEWebNatureRuntime;
-import org.eclipse.jst.j2ee.internal.webservices.WebServiceEditModel;
-import org.eclipse.jst.j2ee.webservice.internal.wsclient.impl.Webservice_clientFactoryImpl;
-import org.eclipse.jst.j2ee.webservice.wsclient.Handler;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.j2ee.webservice.wsclient.WebServicesResource;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientFactory;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.HandlerTableItem;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.common.internal.emf.utilities.EtoolsCopyUtility;
-
-/*
- * Provide a way to externalize the edited fields and create new handlers
- *  
- */
-public class ClientHandlersWidgetOutputCommand extends SimpleCommand {
-
-  //private List handlerTableItems_;
-  private Hashtable oldWSServiceRefsToHandlersTable_;
-
-  private Hashtable newWSServiceRefsToHandlersTable_;
-
-  private WebServiceEditModel wsEditModel_;
-
-  private Hashtable handlersTable_;
-
-  private IProject project_;
-
-  private WebServicesResource wsClientRes_;
-
-  private Collection wsServiceRefs_;
-
-  private J2EEEditModel editModel_;
-
-  private Object accessorKey_;
-
-  public Status execute(Environment env) {
-    String pluginId = "org.eclipse.jst.ws.consumption.ui";
-    MessageUtils msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-    Status status = new SimpleStatus("");
-
-    try {
-
-      JavaEMFNature jMOF = (JavaEMFNature) JavaEMFNature.createRuntime(project_);
-
-      oldWSServiceRefsToHandlersTable_ = new Hashtable();
-      newWSServiceRefsToHandlersTable_ = new Hashtable();
-
-      if (wsServiceRefs_ != null) {
-        Iterator wsRefsIter = wsServiceRefs_.iterator();
-        for (int i = 0; i < wsServiceRefs_.size(); i++) {
-
-          ServiceRef wsServiceRef = (ServiceRef) wsRefsIter.next();
-
-          List wsHandlers = wsServiceRef.getHandlers();
-          oldWSServiceRefsToHandlersTable_.put(wsServiceRef, wsHandlers);
-          newWSServiceRefsToHandlersTable_.put(wsServiceRef, new ArrayList());
-        }
-
-        Enumeration e = handlersTable_.keys();
-        while (e.hasMoreElements()) {
-
-          String serviceRefName = (String) e.nextElement();
-          List handlerTableItems_ = (List) handlersTable_.get(serviceRefName);
-          if (handlerTableItems_ != null) {
-            // form Handler tables
-            for (int i = 0; i < handlerTableItems_.size(); i++) {
-
-              HandlerTableItem hti = (HandlerTableItem) handlerTableItems_.get(i);
-              Object wsModelRef = hti.getWsDescRef();
-              if (wsModelRef != null && wsModelRef instanceof ServiceRef) {
-                ServiceRef wsRef = (ServiceRef) wsModelRef;
-
-                Object handler = hti.getHandler();
-                if (handler != null && handler instanceof Handler) {
-                  // clone it
-                  Handler clonedHandler = (Handler) EtoolsCopyUtility.createCopy((Handler) handler);
-                  ((List) newWSServiceRefsToHandlersTable_.get(wsRef)).add(clonedHandler);
-                }
-                else {
-                  // create it
-                  Webservice_clientFactory wsClientFactory = new Webservice_clientFactoryImpl();
-                  Handler newHandler = wsClientFactory.createHandler();
-                  newHandler.setHandlerName(hti.getHandlerName());
-
-                  JavaClass javaClass = (JavaClass) JavaClassImpl.reflect(hti.getHandlerClassName(), jMOF.getResourceSet());
-                  if (javaClass != null) {
-                    newHandler.setHandlerClass(javaClass);
-                  }
-
-                  ((List) newWSServiceRefsToHandlersTable_.get(wsRef)).add(newHandler);
-                }
-
-              }
-
-            }
-          }
-        }
-
-        // add handlers to ports
-        addHandlersToServiceRefs();
-        getJ2EEEditModel();
-        
-        // save the resource
-        if (J2EEUtils.getJ2EEVersion(project_) == J2EEVersionConstants.J2EE_1_4_ID) {
-          editModel_.save(accessorKey_);
-        }
-        else {
-          if (wsClientRes_!=null)
-            wsClientRes_.save(new HashMap());
-        }
-      }
-    }
-    catch (Exception e) {
-      return new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_TASK_EXCEPTED"), Status.ERROR, e);
-    }
-    finally {
-      if (editModel_ != null) 
-        editModel_.releaseAccess(accessorKey_);
-    }
-    return status;
-  }
-
-  private void addHandlersToServiceRefs() {
-    try {
-      int key = 0;
-      Enumeration refsToHandlers = newWSServiceRefsToHandlersTable_.keys();
-      while (refsToHandlers.hasMoreElements()) {
-        ServiceRef serviceRef = (ServiceRef) refsToHandlers.nextElement();
-        if (serviceRef != null) {
-
-          List handlers = (List) newWSServiceRefsToHandlersTable_.get(serviceRef);
-          List modelHandlers = (List) oldWSServiceRefsToHandlersTable_.get(serviceRef);
-          modelHandlers.clear();
-          modelHandlers.addAll(handlers);
-        }
-      }
-    }
-    catch (Exception e) {
-      e.printStackTrace();
-    }
-  }
-
-  /**
-   * @param handlerTableItems
-   *          The handlerTableItems to set.
-   */
-  //  public void setAllHandlersList(List handlerTableItems) {
-  //    this.handlerTableItems_ = handlerTableItems;
-  //  }
-  public void setHandlersTable(Hashtable handlersTable) {
-    this.handlersTable_ = handlersTable;
-  }
-
-  /**
-   * @param wsEditModel
-   *          The wsEditModel to set.
-   */
-  public void setWsEditModel(WebServiceEditModel wsEditModel) {
-    this.wsEditModel_ = wsEditModel;
-  }
-
-  public void setClientProject(IProject project) {
-    this.project_ = project;
-  }
-
-  public void setWsClientResource(WebServicesResource wsRes) {
-    this.wsClientRes_ = wsRes;
-  }
-
-  public void setWsServiceRefs(Collection wsRefs) {
-    this.wsServiceRefs_ = wsRefs;
-  }
-
-  public void getJ2EEEditModel() {
-  	accessorKey_ = new Object();
-    if (ResourceUtils.isWebProject(project_)) {
-      J2EEWebNatureRuntime rt = J2EEWebNatureRuntime.getRuntime(project_);
-      if (rt != null) {
-        editModel_ = rt.getWebAppEditModelForWrite(accessorKey_);
-      }
-    }
-    else if (ResourceUtils.isAppClientProject(project_)){
-      ApplicationClientNatureRuntime rt = ApplicationClientNatureRuntime.getRuntime(project_);
-      if (rt!=null) {
-        editModel_ = rt.getAppClientEditModelForWrite(accessorKey_);
-      }
-    }
-    else if (ResourceUtils.isEJBProject(project_)){
-      EJBNatureRuntime rt = EJBNatureRuntime.getRuntime(project_);
-      if(rt!=null){
-        editModel_ = rt.getEJBEditModelForWrite(accessorKey_);
-      }
-    }
-  }
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientWizardWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientWizardWidget.java
deleted file mode 100644
index ba5fa34..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientWizardWidget.java
+++ /dev/null
@@ -1,111 +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.consumption.ui.widgets;
-
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.context.ResourceContext;
-import org.eclipse.wst.command.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.env.ui.widgets.WidgetDataEvents;
-
-
-public class ClientWizardWidget extends SimpleWidgetDataContributor
-{  
-  private WebServiceClientTypeWidget clientWidget_;
-  private PreferencesSelectionWidget preferencesWidget_;
-  
-  /*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 project page*/
-  private String INFOPOP_PWPR_CHECKBOX_MONITOR_SERVICE = "PWRPR0014";
-  private Button monitorService;
-  
-  /*CONTEXT_ID PWPR0001 for the Project Page*/
-  private String INFOPOP_PWPR_PAGE = "PWPR0001";
-    
-  public WidgetDataEvents addControls( Composite parent, Listener statusListener)
-  {
-    String       pluginId = "org.eclipse.jst.ws.consumption.ui";
-    MessageUtils msgUtils = new MessageUtils( pluginId + ".plugin", this );
-    UIUtils      utils    = new UIUtils( msgUtils, pluginId );
-    
-    PlatformUI.getWorkbench().getHelpSystem().setHelp( parent, pluginId + "." +  INFOPOP_PWPR_PAGE );
-  	
-  	Composite clientComposite = utils.createComposite( parent, 1 );
-  	
-    clientWidget_ = new WebServiceClientTypeWidget();
-    clientWidget_.addControls(clientComposite, statusListener );
-    
-    
-    //  Create test service check box.
-    Composite testGroup = utils.createComposite(clientComposite,1);
-    
-    testService_ = utils.createCheckbox( testGroup, "CHECKBOX_TEST_WEBSERVICE",
-                                         "TOOLTIP_PWPR_CHECKBOX_TEST_SERVICE",
-                                         INFOPOP_PWPR_CHECKBOX_TEST_SERVICE );
-    
-    // Create monitor service check box.
-    monitorService = utils.createCheckbox(testGroup, "CHECKBOX_MONITOR_WEBSERVICE", "TOOLTIP_PWPR_CHECKBOX_MONITOR_SERVICE", INFOPOP_PWPR_CHECKBOX_MONITOR_SERVICE);
-
-    // Create the preferences controls.
-    preferencesWidget_ = new PreferencesSelectionWidget();
-    preferencesWidget_.addControls( clientComposite, statusListener );
-    
-    return this;
-  }
-  
-  public void setResourceContext( ResourceContext context )
-  {
-    preferencesWidget_.setResourceContext( context );
-  }
-   
-  public ResourceContext getResourceContext()
-  {
-    return preferencesWidget_.getResourceContext(); 
-  }
-  
-  public void setClientTypeRuntimeServer( TypeRuntimeServer ids )
-  {
-    clientWidget_.setTypeRuntimeServer( ids );
-  }
-  
-  public TypeRuntimeServer getClientTypeRuntimeServer()
-  {
-    return clientWidget_.getTypeRuntimeServer();  
-  }
-  
-  public Boolean getTestService()
-  {
-    return new Boolean( testService_.getSelection() );
-  }
-  
-  public void setTestService( Boolean value )
-  {
-    testService_.setSelection( value.booleanValue() );  
-  }
-  
-  public Boolean getMonitorService()
-  {
-    return new Boolean(monitorService.getSelection());
-  }
-  
-  public void setMonitorService(Boolean value)
-  {
-    monitorService.setSelection(value.booleanValue());
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientWizardWidgetDefaultingCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientWizardWidgetDefaultingCommand.java
deleted file mode 100644
index ea05223..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientWizardWidgetDefaultingCommand.java
+++ /dev/null
@@ -1,65 +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.consumption.ui.widgets;
-
-import org.eclipse.jst.ws.internal.context.ScenarioContext;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.jst.ws.internal.wsrt.WebServiceRuntimeExtensionUtils;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.context.ResourceContext;
-
-
-public class ClientWizardWidgetDefaultingCommand extends SimpleCommand
-{    
-  public Boolean getTestService()
-  {
-    return new Boolean( getScenarioContext().getTestWebService() );
-  }
-  
-  public Boolean getMonitorService()
-  {
-    return new Boolean( getScenarioContext().getMonitorWebService());
-  }
-
-  public ResourceContext getResourceContext()
-  { 
-    return WebServicePlugin.getInstance().getResourceContext();
-  }
-  
-  // Current ScenarioContext is used to default the first page of the wizard.  The 
-  // properties in ScenarioContext are mapped individual.  Therefore, ScenarioContext
-  // should not also be mapped.
-  protected ScenarioContext getScenarioContext()
-  {
-    return WebServicePlugin.getInstance().getScenarioContext();
-  }
-  
-  // TODO Set client name defaults here.  
-  public TypeRuntimeServer getClientTypeRuntimeServer()
-  {
-    // rskreg
-		//WebServiceClientTypeRegistry registry = WebServiceClientTypeRegistry.getInstance();
-    String                       type     = getScenarioContext().getClientWebServiceType();
-    //String                       runtime  = registry.getAllClientRuntimes()[0];
-		String                       runtime  = WebServiceRuntimeExtensionUtils.getAllClientRuntimes()[0];
-    //String                       server   = registry.getAllClientServerFactoryIds()[0];
-		String                       server   = WebServiceRuntimeExtensionUtils.getAllClientServerFactoryIds()[0];
-    TypeRuntimeServer            result   = new TypeRuntimeServer();
-		// rskreg
-    
-    result.setTypeId( type );
-    result.setRuntimeId( runtime );
-    result.setServerId( server ); 
-    
-    return result;  
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientWizardWidgetOutputCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientWizardWidgetOutputCommand.java
deleted file mode 100644
index 5c70f36..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientWizardWidgetOutputCommand.java
+++ /dev/null
@@ -1,65 +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.consumption.ui.widgets;
-
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.context.ResourceContext;
-
-
-public class ClientWizardWidgetOutputCommand extends SimpleCommand
-{    
-  private boolean           testService_;
-  private boolean monitorService;
-  private ResourceContext   resourceContext_;
-  private TypeRuntimeServer clientIds_;
-  
-  public boolean getTestService()
-  {
-    return testService_;
-  }
-
-  public void setTestService( boolean testService )
-  {
-    testService_ = testService;  
-  }
-  
-  public boolean getMonitorService()
-  {
-    return monitorService;
-  }
-  
-  public void setMonitorService(boolean monitorService)
-  {
-    this.monitorService = monitorService;
-  }
-  
-  public ResourceContext getResourceContext()
-  {
-    
-    return resourceContext_;
-  }
-  
-  public void setResourceContext( ResourceContext context )
-  {
-    resourceContext_ = context;  
-  }
-  
-  public TypeRuntimeServer getClientTypeRuntimeServer()
-  {    
-    return clientIds_;  
-  }
-  
-  public void setClientTypeRuntimeServer( TypeRuntimeServer clientIds )
-  {
-    clientIds_ = clientIds;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ConfigClientHandlersTableWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ConfigClientHandlersTableWidget.java
deleted file mode 100644
index 6c5da03..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ConfigClientHandlersTableWidget.java
+++ /dev/null
@@ -1,594 +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.consumption.ui.widgets;
-
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.HandlerTableItem;
-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.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.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.command.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.env.ui.widgets.WidgetDataEvents;
-
-/**
- * ConfigClientHandlersTreeWidget
- *  
- */
-public class ConfigClientHandlersTableWidget extends SimpleWidgetDataContributor {
-
-  private String pluginId_ = "org.eclipse.jst.ws.consumption.ui";
-  private MessageUtils msgUtils_ = null;
-  private Listener statusListener_;
-  private Composite parent_;
-  private boolean isGenSkeletonEnabled_;
-  private String outputLocation_;
-  private Combo webServiceRefCombo_;
-  private Table handlersTable_;
-  private TableViewer tableViewer_;
-  private Button addButton_;
-  private Button removeButton_;
-  private Button genSkeletonRadioButton_;
-  private Combo sourceLocationCombo_;
-
-  private Hashtable pathsTable_ = new Hashtable();
-  private Hashtable wsRefsToHandlers_;
-  private Hashtable refNameToServiceRef_;
-  private Vector orderedHandlers_;
-  //private ServiceRef serviceRef_;
-  private String serviceRefName_;
-  private int DEFAULT_COLUMN_WIDTH = 150;
-
-  // ----TOOLTIPS Section----
-  /* CONTEXT_ID HDLR0001 for the Handler Config Page */
-  private final String INFOPOP_HDLR_WS_HANDLERS = "HDLR0001"; //$NON-NLS-1$
-  private final String TOOLTIP_EDIT_WS_HANDLERS = "TOOLTIP_EDIT_WS_HANDLERS";
-
-  /* CONTEXT_ID HDLR0002 for the Handler Config Page */
-  private final String INFOPOP_HDLR_GEN_SKELETON = "HDLR0002"; //$NON-NLS-1$
-  private final String TOOLTIP_BUTTON_GEN_SKELETON = "TOOLTIP_BUTTON_GEN_SKELETON";
-
-  /* CONTEXT_ID HDLR0003 for the Handler Config Page */
-  private final String INFOPOP_COMBO_SOURCE_LOC = "HDLR0003"; //$NON-NLS-1$
-  private final String TOOLTIP_COMBO_SOURCE_LOC = "TOOLTIP_COMBO_SOURCE_LOC";
-
-  /* CONTEXT_ID HDLR0004 for the Handler Config Page */
-  private final String INFOPOP_WS_CLIENT_REF = "HDLR0004"; //$NON-NLS-1$
-  private final String TOOLTIP_WS_CLIENT_REF = "TOOLTIP_WS_CLIENT_REF";
-
-  // ------------------------
-
-  public ConfigClientHandlersTableWidget() {
-    super();
-  }
-
-  public WidgetDataEvents addControls(Composite parent, Listener statusListener) {
-    msgUtils_ = new MessageUtils(WebServiceConsumptionUIPlugin.ID + ".plugin", this);
-    UIUtils uiUtils = new UIUtils(msgUtils_, pluginId_);
-
-    parent_ = parent;
-    statusListener_ = statusListener;
-
-    // Web service reference combo
-    Composite webServiceRefComp = uiUtils.createComposite(parent_, 2);
-    webServiceRefCombo_ = uiUtils.createCombo(webServiceRefComp, "LABEL_COMBO_WS_CLIENT_REF", TOOLTIP_WS_CLIENT_REF, INFOPOP_WS_CLIENT_REF,
-        SWT.READ_ONLY);
-    webServiceRefCombo_.addSelectionListener(new SelectionAdapter() {
-
-      public void widgetSelected(SelectionEvent evt) {
-        handleWebServiceRefCombo(evt);
-      }
-    });
-
-    Composite displayComp = new Composite(parent_, SWT.NONE);
-    GridLayout gridlayout = new GridLayout(2, false);
-    displayComp.setLayout(gridlayout);
-    displayComp.setLayoutData(uiUtils.createFillAll());
-
-    Composite handlersComp = uiUtils.createComposite(displayComp, 1);
-    GridData griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING
-        | GridData.VERTICAL_ALIGN_FILL);
-    handlersComp.setLayoutData(griddata);
-    handlersComp.setSize(130, 600);
-
-    Composite buttonsComp = uiUtils.createComposite(displayComp, 1);
-    griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING);
-    buttonsComp.setLayoutData(griddata);
-
-    Text handlersText = new Text(handlersComp, SWT.READ_ONLY);
-    handlersText.setText(msgUtils_.getMessage("LABEL_HANDLERS_CONFIG"));
-    GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-    gd.horizontalSpan = 2;
-    handlersText.setLayoutData(gd);
-
-    handlersTable_ = uiUtils.createTable(handlersComp, TOOLTIP_EDIT_WS_HANDLERS, INFOPOP_HDLR_WS_HANDLERS, SWT.MULTI | SWT.FULL_SELECTION);
-    handlersTable_.setHeaderVisible(true);
-    handlersTable_.setLinesVisible(true);
-
-    // empty space
-    Label wsLabel = new Label(buttonsComp, SWT.NONE);
-    gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-    gd.horizontalSpan = 2;
-    wsLabel.setLayoutData(gd);
-
-    Button moveUpButton = uiUtils.createPushButton(buttonsComp, "LABEL_BUTTON_MOVE_UP", null, null);
-    griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING);
-    moveUpButton.setLayoutData(griddata);
-    moveUpButton.addSelectionListener(new SelectionListener() {
-
-      public void widgetSelected(SelectionEvent event) {
-        handleMoveUpButtonSelected(event);
-      }
-
-      public void widgetDefaultSelected(SelectionEvent event) {
-      }
-    });
-
-    Button moveDownButton = uiUtils.createPushButton(buttonsComp, "LABEL_BUTTON_MOVE_DOWN", null, null);
-    griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING);
-    moveDownButton.setLayoutData(griddata);
-    moveDownButton.addSelectionListener(new SelectionListener() {
-
-      public void widgetSelected(SelectionEvent event) {
-        handleMoveDownButtonSelected(event);
-      }
-
-      public void widgetDefaultSelected(SelectionEvent event) {
-      }
-    });
-
-    // empty space
-    wsLabel = new Label(buttonsComp, SWT.NONE);
-    gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-    gd.horizontalSpan = 2;
-    wsLabel.setLayoutData(gd);
-
-    addButton_ = uiUtils.createPushButton(buttonsComp, "LABEL_BUTTON_ADD", null, null);
-    griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING);
-    addButton_.setLayoutData(griddata);
-    addButton_.addSelectionListener(new SelectionListener() {
-
-      public void widgetSelected(SelectionEvent event) {
-        handleAddButtonSelected(event);
-      }
-
-      public void widgetDefaultSelected(SelectionEvent event) {
-      }
-    });
-
-    removeButton_ = uiUtils.createPushButton(buttonsComp, "LABEL_BUTTON_REMOVE", null, null);
-    griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING);
-    removeButton_.setLayoutData(griddata);
-    removeButton_.addSelectionListener(new SelectionListener() {
-
-      public void widgetSelected(SelectionEvent event) {
-        handleRemoveButtonSelected(event);
-      }
-
-      public void widgetDefaultSelected(SelectionEvent event) {
-      }
-    });
-    enableRemove(false);
-
-    // table stuff
-    String[] columns_ = new String[] { msgUtils_.getMessage("LABEL_HANDLER_NAME"), msgUtils_.getMessage("LABLE_HANDLER_CLASS")};
-
-    for (int i = 0; i < columns_.length; i++) {
-      TableColumn tableColumn = new TableColumn(handlersTable_, i);
-      tableColumn.setText(columns_[i]);
-      tableColumn.setAlignment(SWT.LEFT);
-      tableColumn.setWidth(DEFAULT_COLUMN_WIDTH);
-      tableColumn.setResizable(true);
-    }
-
-    tableViewer_ = new TableViewer(handlersTable_);
-    Control control = tableViewer_.getControl();
-
-    GridData data = new GridData();
-    data.horizontalAlignment = GridData.FILL;
-    data.grabExcessHorizontalSpace = true;
-    data.verticalAlignment = GridData.FILL;
-    data.grabExcessVerticalSpace = true;
-    control.setLayoutData(data);
-
-    tableViewer_.setColumnProperties(columns_);
-    tableViewer_.setContentProvider(new ListContentProvider());
-    tableViewer_.setLabelProvider(new ListLabelProvider());
-    tableViewer_.addSelectionChangedListener(new ISelectionChangedListener() {
-
-      public void selectionChanged(SelectionChangedEvent event) {
-        enableRemove(true);
-      }
-    });
-
-    // gen skeleton check box
-    genSkeletonRadioButton_ = uiUtils.createCheckbox(parent_, "LABEL_BUTTON_GEN_SKELETON", TOOLTIP_BUTTON_GEN_SKELETON, INFOPOP_HDLR_GEN_SKELETON);
-    genSkeletonRadioButton_.addSelectionListener(new SelectionAdapter() {
-
-      public void widgetSelected(SelectionEvent evt) {
-        handleGenSkeletonRadioButton();
-      }
-    });
-
-    // source location combo
-    Composite sourceLocationComp = uiUtils.createComposite(parent_, 2);
-    sourceLocationCombo_ = uiUtils.createCombo(sourceLocationComp, "LABEL_COMBO_SOURCE_LOC", TOOLTIP_COMBO_SOURCE_LOC, INFOPOP_COMBO_SOURCE_LOC,
-        SWT.READ_ONLY);
-    sourceLocationCombo_.addSelectionListener(new SelectionAdapter() {
-
-      public void widgetSelected(SelectionEvent evt) {
-        handleSourceLocationCombo(evt);
-      }
-    });
-
-    return this;
-  }
-
-  // Called at start
-  private void populateHandlersTable() {
-    try {
-
-      int sizeOfHandlers = wsRefsToHandlers_.size();
-      String[] wsRefs = new String[sizeOfHandlers];
-
-      String[] wsRefNames = (String[]) wsRefsToHandlers_.keySet().toArray(new String[0]);
-      webServiceRefCombo_.setItems(wsRefNames);
-      webServiceRefCombo_.select(0);
-
-      if (sizeOfHandlers < 1) {
-        webServiceRefCombo_.select(0);
-        webServiceRefCombo_.setEnabled(false);
-      }
-      else {
-        if (serviceRefName_ != null) {
-          int index = webServiceRefCombo_.indexOf(serviceRefName_);
-          if (index != -1) webServiceRefCombo_.select(index);
-        }
-        else
-          webServiceRefCombo_.select(0);
-      }
-
-      // get webServiceRef hint
-      String wsRef = webServiceRefCombo_.getText();
-
-      if (wsRefsToHandlers_.get(wsRef) != null) {
-        orderedHandlers_ = (Vector) wsRefsToHandlers_.get(wsRef);
-        tableViewer_.setInput(orderedHandlers_);
-        tableViewer_.refresh();
-      }
-    }
-    catch (Exception e) {
-      e.printStackTrace();
-    }
-
-  }
-
-  /**
-   * @return Returns the handlers.
-   */
-  public List getAllHandlersList() {
-    // convert to a ArrayList and return as List
-    List list = new ArrayList();
-    if (orderedHandlers_ != null && !orderedHandlers_.isEmpty()) list.addAll(orderedHandlers_);
-
-    return list;
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.eclipse.wst.command.env.ui.widgets.WidgetContributor#getStatus()
-   */
-  public Status getStatus() {
-    Status finalStatus = new SimpleStatus("");
-
-    return finalStatus;
-  }
-
-  private void handleAddButtonSelected(SelectionEvent event) {
-
-    AddHandlerDialog dialog = dialog = new AddHandlerDialog(parent_.getShell(), true);
-    dialog.create();
-    dialog.getShell().setSize( 500, 200 );
-    
-    int result = dialog.open();
-
-    if (result == Window.OK) {
-      String name = dialog.getName();
-      String className = dialog.getClassName();
-
-      HandlerTableItem hi = new HandlerTableItem();
-      hi.setHandlerName(name);
-      hi.setHandlerClassName(className);
-      String wsRefName = webServiceRefCombo_.getText();
-      ServiceRef serviceRef = (ServiceRef) refNameToServiceRef_.get(wsRefName);
-      hi.setWsDescRef(serviceRef);
-
-      orderedHandlers_ = (Vector) wsRefsToHandlers_.get(wsRefName);
-      orderedHandlers_.add(hi);
-
-    }
-
-    refresh();
-  }
-
-  private void handleRemoveButtonSelected(SelectionEvent event) {
-    handleDeleteKeyPressed();
-  }
-
-  private void handleMoveUpButtonSelected(SelectionEvent event) {
-
-    int index = tableViewer_.getTable().getSelectionIndex();
-    ISelection selected = tableViewer_.getSelection();
-    if (index != -1) {
-      if (index > 0) {
-        orderedHandlers_ = (Vector) wsRefsToHandlers_.get(webServiceRefCombo_.getText());
-        Object object = orderedHandlers_.remove(index);
-        orderedHandlers_.insertElementAt(object, index - 1);
-        tableViewer_.refresh();
-      }
-    }
-
-  }
-
-  private void handleMoveDownButtonSelected(SelectionEvent event) {
-
-    int index = tableViewer_.getTable().getSelectionIndex();
-    ISelection selected = tableViewer_.getSelection();
-    if (index != -1) {
-      if (index < orderedHandlers_.size() - 1) {
-        orderedHandlers_ = (Vector) wsRefsToHandlers_.get(webServiceRefCombo_.getText());        
-        Object object = orderedHandlers_.remove(index);
-        orderedHandlers_.insertElementAt(object, index + 1);
-        tableViewer_.refresh();
-      }
-    }
-
-  }
-
-  public void handleSourceLocationCombo(SelectionEvent event) {
-    outputLocation_ = sourceLocationCombo_.getText();
-  }
-
-  public void handleGenSkeletonRadioButton() {
-    if (genSkeletonRadioButton_.isEnabled()) {
-      if (genSkeletonRadioButton_.getSelection())
-        this.isGenSkeletonEnabled_ = true;
-      else
-        this.isGenSkeletonEnabled_ = false;
-    }
-  }
-
-  public void handleWebServiceRefCombo(SelectionEvent event) {
-
-    if (webServiceRefCombo_.isEnabled()) {
-      String webServiceRefName = webServiceRefCombo_.getText();
-      Vector hndlers = (Vector) wsRefsToHandlers_.get(webServiceRefName);
-      //HandlerTableItem item = (HandlerTableItem)hndlers.get(0);
-      //serviceRef_ = (ServiceRef)item.getWsDescRef();
-      if (hndlers != null) {
-        tableViewer_.setInput(hndlers);
-        tableViewer_.refresh();
-      }
-    }
-  }
-
-  /**
-   * @return Returns the isGenSkeletonEnabled_.
-   */
-  public boolean isGenSkeletonEnabled_() {
-    return isGenSkeletonEnabled_;
-  }
-
-  protected class ListLabelProvider extends LabelProvider implements ITableLabelProvider {
-
-    public Image getColumnImage(Object element, int columnIndex) {
-      return null;
-    }
-
-    public String getColumnText(Object object, int columnIndex) {
-
-      if (object instanceof HandlerTableItem) {
-        HandlerTableItem hti = (HandlerTableItem) object;
-        if (columnIndex == 0) {
-
-          return hti.getHandlerName() != null ? hti.getHandlerName() : "";
-        }
-        else if (columnIndex == 1) { return hti.getHandlerClassName() != null ? hti.getHandlerClassName() : ""; }
-      }
-      return null;
-    }
-
-  }
-
-  private void enableRemove(boolean enabled) {
-    removeButton_.setEnabled(enabled && !tableViewer_.getSelection().isEmpty());
-  }
-
-  protected class ListContentProvider implements IStructuredContentProvider {
-
-    public Object[] getElements(Object element) {
-      if (element instanceof Vector) { return ((Vector) element).toArray(); }
-      return null;
-    }
-
-    public void dispose() {
-    }
-
-    public void inputChanged(Viewer viewer, Object old, Object newobj) {
-    }
-
-    public boolean isDeleted(Object object) {
-      return false;
-    }
-  }
-
-  private void handleDeleteKeyPressed() {
-    ISelection selection = tableViewer_.getSelection();
-    if (selection != null && !selection.isEmpty() && (selection instanceof IStructuredSelection)) {
-      int selectionIndex = handlersTable_.getSelectionIndex();
-      int selectionCount = handlersTable_.getItemCount();
-
-      orderedHandlers_ = (Vector) wsRefsToHandlers_.get(webServiceRefCombo_.getText());
-      orderedHandlers_.remove(selectionIndex);
-      refresh();
-    }
-  }
-
-  public void refresh() {
-    try {
-      tableViewer_.setInput(null);
-      if (orderedHandlers_ != null) tableViewer_.setInput(orderedHandlers_);
-      tableViewer_.refresh();
-    }
-    catch (Exception e) {
-      e.printStackTrace();
-    }
-  }
-
-  public void setGenSkeletonEnabled(boolean isGenSkeletonEnabled) {
-    this.isGenSkeletonEnabled_ = isGenSkeletonEnabled;
-    genSkeletonRadioButton_.setSelection(isGenSkeletonEnabled);
-
-  }
-
-  public boolean getGenSkeletonEnabled() {
-    return this.isGenSkeletonEnabled_;
-  }
-
-  public void setSourceOutputLocation(IPath[] locations) {
-    if (locations[0]!=null)
-      this.outputLocation_ = locations[0].toString();
-    else
-      return;
-    
-    String[] paths = new String[locations.length];
-    for (int i = 0; i < locations.length; i++) {
-      paths[i] = locations[i].toString();
-      pathsTable_.put(paths[i], locations[i]);
-    }
-    sourceLocationCombo_.setItems(paths);
-    sourceLocationCombo_.select(0);
-
-  }
-
-  public IPath getSourceOutputLocation() {
-    IPath outputPath = (IPath) pathsTable_.get(outputLocation_);
-    return outputPath;
-  }
-
-  /**
-   * @return Returns the handlerClassNames.
-   */
-  public String[] getHandlerClassNames() {
-    Vector handlerClasses = new Vector();
-
-    Enumeration e = wsRefsToHandlers_.keys();
-    while (e.hasMoreElements()) {
-
-      String wsRefName = (String) e.nextElement();
-      orderedHandlers_ = (Vector) wsRefsToHandlers_.get(wsRefName);
-
-      if (orderedHandlers_ != null) {
-        for (int i = 0; i < orderedHandlers_.size(); i++) {
-          HandlerTableItem hti = (HandlerTableItem) orderedHandlers_.get(i);
-          handlerClasses.add(hti.getHandlerClassName());
-        }
-      }
-    }
-    return (String[])handlerClasses.toArray(new String[0]);
-  }
-
-  /**
-   * @return Returns the wsRefsToHandlers_.
-   */
-  public Hashtable getWsRefsToHandlers() {
-    return wsRefsToHandlers_;
-  }
-
-  /**
-   * @param wsRefsToHandlers_
-   *          The wsRefsToHandlers_ to set.
-   */
-  public void setWsRefsToHandlers(Hashtable wsRefsToHandlersArray) {
-
-    wsRefsToHandlers_ = new Hashtable();
-    try {
-
-      if (wsRefsToHandlersArray != null) {
-        int sizeOfHandlers = wsRefsToHandlersArray.size();
-        String[] wsRefs = new String[sizeOfHandlers];
-        // store the wsRefs
-        Enumeration wsRef = wsRefsToHandlersArray.keys();
-        while (wsRef.hasMoreElements()) {
-          String wsRefName = (String) wsRef.nextElement();
-
-          HandlerTableItem[] handlers = (HandlerTableItem[]) wsRefsToHandlersArray.get(wsRefName);
-          // process the handlersTable
-          orderedHandlers_ = new Vector();
-          for (int i = 0; i < handlers.length; i++) {
-            orderedHandlers_.add(handlers[i]);
-          }
-          wsRefsToHandlers_.put(wsRefName, orderedHandlers_);
-
-        }
-      }
-      populateHandlersTable();
-    }
-    catch (Exception e) {
-      e.printStackTrace();
-    }
-
-  }
-
-  public void setServiceRefName(String wsRefName) {
-    serviceRefName_ = wsRefName;
-  }
-
-  public void setRefNameToServiceRef(Hashtable refName2SF) {
-    this.refNameToServiceRef_ = refName2SF;
-  }
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ConfigServiceHandlersTableWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ConfigServiceHandlersTableWidget.java
deleted file mode 100644
index eaa9bb5..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ConfigServiceHandlersTableWidget.java
+++ /dev/null
@@ -1,633 +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.consumption.ui.widgets;
-
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jst.j2ee.webservice.wsdd.PortComponent;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.HandlerTableItem;
-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.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.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.command.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.env.ui.widgets.WidgetDataEvents;
-
-/**
- * ConfigServiceHandlersTreeWidget
- *  
- */
-public class ConfigServiceHandlersTableWidget extends SimpleWidgetDataContributor {
-
-  private String pluginId_ = "org.eclipse.jst.ws.consumption.ui";
-  private MessageUtils msgUtils_ = null;
-  private Listener statusListener_;
-  private Composite parent_;
-  private boolean isGenSkeletonEnabled_;
-  private String outputLocation_;
-
-  private Table handlersTable_;
-  private TableViewer tableViewer_;
-  private Combo webServiceDescCombo_;
-  private Button addButton_;
-  private Button removeButton_;
-  private Button genSkeletonRadioButton_;
-  private Combo sourceLocationCombo_;
-  private Text text_; // selected Text
-
-  private HandlerTableItem[] handlers;
-  private Hashtable pathsTable_ = new Hashtable();
-  private Hashtable wsDescToHandlers_;
-  private Hashtable wsDescToPorts_;
-  private Hashtable serviceDescNameToDescObj_;
-  private String descriptionName_ = null;
-
-  private Vector orderedHandlers_;
-
-  private int DEFAULT_COLUMN_WIDTH = 90;
-
-  // ----TOOLTIPS Section----
-  /* CONTEXT_ID SHLD0001 for the Handler Config Page */
-  private final String INFOPOP_HDLR_WS_HANDLERS = "SHDL0001"; //$NON-NLS-1$
-  private final String TOOLTIP_EDIT_WS_HANDLERS = "TOOLTIP_EDIT_WS_HANDLERS";
-
-  /* CONTEXT_ID SHDL0002 for the Handler Config Page */
-  private final String INFOPOP_HDLR_GEN_SKELETON = "SHDL0002"; //$NON-NLS-1$
-  private final String TOOLTIP_BUTTON_GEN_SKELETON = "TOOLTIP_BUTTON_GEN_SKELETON";
-
-  /* CONTEXT_ID SHDL0003 for the Handler Config Page */
-  private final String INFOPOP_COMBO_SOURCE_LOC = "SHDL0003"; //$NON-NLS-1$
-  private final String TOOLTIP_COMBO_SOURCE_LOC = "TOOLTIP_COMBO_SOURCE_LOC";
-
-  /* CONTEXT_ID SHDL0004 for the Handler Config Page */
-  private final String INFOPOP_WS_SERVICE_DESC = "SHDL0004"; //$NON-NLS-1$
-  private final String TOOLTIP_WS_SERVICE_DESC = "TOOLTIP_WS_SERVICE_DESC";
-
-  // ------------------------
-
-  public ConfigServiceHandlersTableWidget() {
-    super();
-  }
-
-  public WidgetDataEvents addControls(Composite parent, Listener statusListener) {
-    msgUtils_ = new MessageUtils(WebServiceConsumptionUIPlugin.ID + ".plugin", this);
-    UIUtils uiUtils = new UIUtils(msgUtils_, pluginId_);
-
-    parent_ = parent;
-    statusListener_ = statusListener;
-
-    // Web service reference combo
-    Composite webServiceRefComp = uiUtils.createComposite(parent_, 2);
-    webServiceDescCombo_ = uiUtils.createCombo(webServiceRefComp, "LABEL_COMBO_WS_SERVICE_DESC", TOOLTIP_WS_SERVICE_DESC, TOOLTIP_WS_SERVICE_DESC,
-        SWT.READ_ONLY);
-    webServiceDescCombo_.addSelectionListener(new SelectionAdapter() {
-
-      public void widgetSelected(SelectionEvent evt) {
-        handleWebServiceDescCombo(evt);
-      }
-    });
-
-    Composite displayComp = new Composite(parent, SWT.NONE);
-
-    GridLayout gridlayout = new GridLayout(2, false);
-    displayComp.setLayout(gridlayout);
-    displayComp.setLayoutData(uiUtils.createFillAll());
-
-    Composite handlersComp = uiUtils.createComposite(displayComp, 1);
-    GridData griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING
-        | GridData.VERTICAL_ALIGN_FILL);
-    handlersComp.setLayoutData(griddata);
-    handlersComp.setSize(130, 600);
-
-    Composite buttonsComp = uiUtils.createComposite(displayComp, 1);
-    griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING);
-    buttonsComp.setLayoutData(griddata);
-
-    Text handlersText = new Text(handlersComp, SWT.READ_ONLY);
-    handlersText.setText(msgUtils_.getMessage("LABEL_HANDLERS_CONFIG"));
-    GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-    gd.horizontalSpan = 2;
-    handlersText.setLayoutData(gd);
-
-    handlersTable_ = uiUtils.createTable(handlersComp, TOOLTIP_EDIT_WS_HANDLERS, INFOPOP_HDLR_WS_HANDLERS, SWT.MULTI | SWT.FULL_SELECTION);
-    handlersTable_.setHeaderVisible(true);
-    handlersTable_.setLinesVisible(true);
-
-    // empty space
-    Label wsLabel = new Label(buttonsComp, SWT.NONE);
-    gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-    gd.horizontalSpan = 2;
-    wsLabel.setLayoutData(gd);
-
-    Button moveUpButton = uiUtils.createPushButton(buttonsComp, "LABEL_BUTTON_MOVE_UP", null, null);
-    griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING);
-    moveUpButton.setLayoutData(griddata);
-    moveUpButton.addSelectionListener(new SelectionListener() {
-
-      public void widgetSelected(SelectionEvent event) {
-        handleMoveUpButtonSelected(event);
-      }
-
-      public void widgetDefaultSelected(SelectionEvent event) {
-      }
-    });
-
-    Button moveDownButton = uiUtils.createPushButton(buttonsComp, "LABEL_BUTTON_MOVE_DOWN", null, null);
-    griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING);
-    moveDownButton.setLayoutData(griddata);
-    moveDownButton.addSelectionListener(new SelectionListener() {
-
-      public void widgetSelected(SelectionEvent event) {
-        handleMoveDownButtonSelected(event);
-      }
-
-      public void widgetDefaultSelected(SelectionEvent event) {
-      }
-    });
-
-    // empty space
-    wsLabel = new Label(buttonsComp, SWT.NONE);
-    gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-    gd.horizontalSpan = 2;
-    wsLabel.setLayoutData(gd);
-
-    addButton_ = uiUtils.createPushButton(buttonsComp, "LABEL_BUTTON_ADD", null, null);
-    griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING);
-    addButton_.setLayoutData(griddata);
-    addButton_.addSelectionListener(new SelectionListener() {
-
-      public void widgetSelected(SelectionEvent event) {
-        handleAddButtonSelected(event);
-      }
-
-      public void widgetDefaultSelected(SelectionEvent event) {
-      }
-    });
-
-    removeButton_ = uiUtils.createPushButton(buttonsComp, "LABEL_BUTTON_REMOVE", null, null);
-    griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING);
-    removeButton_.setLayoutData(griddata);
-    removeButton_.addSelectionListener(new SelectionListener() {
-
-      public void widgetSelected(SelectionEvent event) {
-        handleRemoveButtonSelected(event);
-      }
-
-      public void widgetDefaultSelected(SelectionEvent event) {
-      }
-    });
-    enableRemove(false);
-
-    // table stuff here
-    String[] columns_ = new String[] { msgUtils_.getMessage("LABEL_HANDLER_NAME"), msgUtils_.getMessage("LABLE_HANDLER_CLASS"),
-        msgUtils_.getMessage("LABEL_HANDLER_PORT")};
-
-    for (int i = 0; i < columns_.length; i++) {
-      TableColumn tableColumn = new TableColumn(handlersTable_, i);
-      tableColumn.setText(columns_[i]);
-      tableColumn.setAlignment(SWT.LEFT);
-      tableColumn.setWidth(DEFAULT_COLUMN_WIDTH);
-      tableColumn.setResizable(true);
-    }
-
-    tableViewer_ = new TableViewer(handlersTable_);
-    Control control = tableViewer_.getControl();
-
-    GridData data = new GridData();
-    data.horizontalAlignment = GridData.FILL;
-    data.grabExcessHorizontalSpace = true;
-    data.verticalAlignment = GridData.FILL;
-    data.grabExcessVerticalSpace = true;
-    control.setLayoutData(data);
-
-    tableViewer_.setColumnProperties(columns_);
-    tableViewer_.setContentProvider(new ListContentProvider());
-    tableViewer_.setLabelProvider(new ListLabelProvider());
-    tableViewer_.addSelectionChangedListener(new ISelectionChangedListener() {
-
-      public void selectionChanged(SelectionChangedEvent event) {
-        enableRemove(true);
-      }
-    });
-
-    genSkeletonRadioButton_ = uiUtils.createCheckbox(parent_, "LABEL_BUTTON_GEN_SKELETON", TOOLTIP_BUTTON_GEN_SKELETON, INFOPOP_HDLR_GEN_SKELETON);
-    genSkeletonRadioButton_.addSelectionListener(new SelectionAdapter() {
-
-      public void widgetSelected(SelectionEvent evt) {
-        handleGenSkeletonRadioButton();
-      }
-    });
-
-    Composite sourceLocationComp = uiUtils.createComposite(parent_, 2);
-    sourceLocationCombo_ = uiUtils.createCombo(sourceLocationComp, "LABEL_COMBO_SOURCE_LOC", TOOLTIP_COMBO_SOURCE_LOC, INFOPOP_COMBO_SOURCE_LOC,
-        SWT.READ_ONLY);
-    sourceLocationCombo_.addSelectionListener(new SelectionAdapter() {
-
-      public void widgetSelected(SelectionEvent evt) {
-        handleSourceLocationCombo(evt);
-      }
-    });
-
-    return this;
-  }
-
-  // Called at start
-  private void populateHandlersTable() {
-    try {
-
-      int sizeOfHandlers = wsDescToHandlers_.size();
-      String[] wsRefs = new String[sizeOfHandlers];
-
-      String[] wsRefNames = (String[]) wsDescToHandlers_.keySet().toArray(new String[0]);
-      webServiceDescCombo_.setItems(wsRefNames);
-
-      if (sizeOfHandlers < 1) {
-        webServiceDescCombo_.select(0);
-        webServiceDescCombo_.setEnabled(false);
-      }
-      else {
-        if (descriptionName_ != null) {
-          int index = webServiceDescCombo_.indexOf(descriptionName_);
-          if (index != -1) webServiceDescCombo_.select(index);
-        }
-        else
-          webServiceDescCombo_.select(0);
-      }
-      // get webServiceRef hint
-      String wsRef = webServiceDescCombo_.getText();
-
-      if (wsDescToHandlers_.get(wsRef) != null) {
-        orderedHandlers_ = (Vector) wsDescToHandlers_.get(wsRef);
-        tableViewer_.setInput(orderedHandlers_);
-        tableViewer_.refresh();
-      }
-    }
-    catch (Exception e) {
-      e.printStackTrace();
-    }
-
-  }
-
-  /**
-   * @return Returns the handlers.
-   */
-  public List getHandlersList() {
-    // convert to a ArrayList and return as List
-    List list = new ArrayList();
-    if (orderedHandlers_ != null && !orderedHandlers_.isEmpty()) list.addAll(orderedHandlers_);
-
-    return list;
-  }
-
-  public Hashtable getWsDescToHandlers() {
-    return this.wsDescToHandlers_;
-  }
-
-  /**
-   * @param handlers
-   *          The handlers to set.
-   */
-  public void setHandlers(HandlerTableItem[] handlers) {
-    this.handlers = handlers;
-    populateHandlersTable();
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.eclipse.wst.command.env.ui.widgets.WidgetContributor#getStatus()
-   */
-  public Status getStatus() {
-    Status finalStatus = new SimpleStatus("");
-
-    return finalStatus;
-  }
-
-  private void handleAddButtonSelected(SelectionEvent event) {
-  	
-  	String descName = webServiceDescCombo_.getText();
-  	WebServiceDescription serviceDesc = (WebServiceDescription) serviceDescNameToDescObj_.get(descName);
-  	
-    AddHandlerDialog dialog = dialog = new AddHandlerDialog(parent_.getShell(), false);
-    dialog.create();
-    
-    String[] portNames = getPortComponentNames(serviceDesc);
-    dialog.setPortNames(portNames);
-    dialog.getShell().setSize( 500, 200 );
-    
-    int result = dialog.open();
-
-    if (result == Window.OK) {
-      String name = dialog.getName();
-      String className = dialog.getClassName();
-      String port = dialog.getPortName();
-
-      HandlerTableItem hi = new HandlerTableItem();
-      hi.setHandlerName(name);
-      hi.setHandlerClassName(className);
-      hi.setPortName(port);
-      
-      
-      hi.setWsDescRef(serviceDesc);
-
-      orderedHandlers_ = (Vector) wsDescToHandlers_.get(descName);
-      orderedHandlers_.add(hi);
-
-    }
-
-    refresh();
-  }
-
-  private String[] getPortComponentNames(WebServiceDescription webServiceDesc) {
-  	
-  	List ports = webServiceDesc.getPortComponents();
-  	if (ports!=null){
-  		String[] portNames = new String[ports.size()];
-  		for(int i=0;i<ports.size();i++){
-  			PortComponent pc = (PortComponent)ports.get(i);
-  			String pcName = pc.getPortComponentName();
-  			portNames[i] = pcName;
-  		}
-  		return portNames;
-  	}
-  	return new String[0];
-  }
-  
-  private void handleRemoveButtonSelected(SelectionEvent event) {
-    handleDeleteKeyPressed();
-  }
-
-  private void handleMoveUpButtonSelected(SelectionEvent event) {
-
-    int index = tableViewer_.getTable().getSelectionIndex();
-    ISelection selected = tableViewer_.getSelection();
-    if (index != -1) {
-      if (index > 0) {
-        orderedHandlers_ = (Vector) wsDescToHandlers_.get(webServiceDescCombo_.getText());
-        Object object = orderedHandlers_.remove(index);
-        orderedHandlers_.insertElementAt(object, index - 1);
-        tableViewer_.refresh();
-      }
-    }
-
-  }
-
-  private void handleMoveDownButtonSelected(SelectionEvent event) {
-
-    int index = tableViewer_.getTable().getSelectionIndex();
-    ISelection selected = tableViewer_.getSelection();
-    if (index != -1) {
-      if (index < orderedHandlers_.size() - 1) {
-        orderedHandlers_ = (Vector) wsDescToHandlers_.get(webServiceDescCombo_.getText());
-        Object object = orderedHandlers_.remove(index);
-        orderedHandlers_.insertElementAt(object, index + 1);
-        tableViewer_.refresh();
-      }
-    }
-
-  }
-
-  public void handleSourceLocationCombo(SelectionEvent event) {
-    outputLocation_ = sourceLocationCombo_.getText();
-  }
-
-  public void handleGenSkeletonRadioButton() {
-    if (genSkeletonRadioButton_.isEnabled()) {
-      if (genSkeletonRadioButton_.getSelection())
-        this.isGenSkeletonEnabled_ = true;
-      else
-        this.isGenSkeletonEnabled_ = false;
-    }
-  }
-
-  public void handleWebServiceDescCombo(SelectionEvent event) {
-
-    if (webServiceDescCombo_.isEnabled()) {
-      String webServiceRefName = webServiceDescCombo_.getText();
-      Vector hndlers = (Vector) wsDescToHandlers_.get(webServiceRefName);
-      if (hndlers != null) {
-        tableViewer_.setInput(hndlers);
-        tableViewer_.refresh();
-      }
-    }
-  }
-
-  /**
-   * @return Returns the isGenSkeletonEnabled_.
-   */
-  public boolean isGenSkeletonEnabled_() {
-    return isGenSkeletonEnabled_;
-  }
-
-  protected class ListLabelProvider extends LabelProvider implements ITableLabelProvider {
-
-    public Image getColumnImage(Object element, int columnIndex) {
-      return null;
-    }
-
-    public String getColumnText(Object object, int columnIndex) {
-
-      if (object instanceof HandlerTableItem) {
-        HandlerTableItem hti = (HandlerTableItem) object;
-        if (columnIndex == 0) {
-          return hti.getHandlerName() != null ? hti.getHandlerName() : "";
-        }
-        else if (columnIndex == 1) {
-          return hti.getHandlerClassName() != null ? hti.getHandlerClassName() : "";
-        }
-        else {
-          return hti.getPortName() != null ? hti.getPortName() : "";
-        }
-      }
-      return null;
-    }
-
-  }
-
-  private void enableRemove(boolean enabled) {
-    removeButton_.setEnabled(enabled && !tableViewer_.getSelection().isEmpty());
-  }
-
-  protected class ListContentProvider implements IStructuredContentProvider {
-
-    public Object[] getElements(Object element) {
-      if (element instanceof Vector) { return ((Vector) element).toArray(); }
-      return null;
-    }
-
-    public void dispose() {
-    }
-
-    public void inputChanged(Viewer viewer, Object old, Object newobj) {
-    }
-
-    public boolean isDeleted(Object object) {
-      return false;
-    }
-  }
-
-  private void handleDeleteKeyPressed() {
-    //internalDispose();
-    ISelection selection = tableViewer_.getSelection();
-    if (selection != null && !selection.isEmpty() && (selection instanceof IStructuredSelection)) {
-      int selectionIndex = handlersTable_.getSelectionIndex();
-      int selectionCount = handlersTable_.getItemCount();
-
-      orderedHandlers_ = (Vector) wsDescToHandlers_.get(webServiceDescCombo_.getText());
-      orderedHandlers_.remove(selectionIndex);
-      refresh();
-    }
-  }
-
-  public void refresh() {
-    try {
-      tableViewer_.setInput(null);
-      if (orderedHandlers_ != null) tableViewer_.setInput(orderedHandlers_);
-      tableViewer_.refresh();
-    }
-    catch (Exception e) {
-      e.printStackTrace();
-    }
-  }
-
-  public void setGenSkeletonEnabled(boolean isGenSkeletonEnabled) {
-    this.isGenSkeletonEnabled_ = isGenSkeletonEnabled;
-    genSkeletonRadioButton_.setSelection(isGenSkeletonEnabled);
-
-  }
-
-  public boolean getGenSkeletonEnabled() {
-    return this.isGenSkeletonEnabled_;
-  }
-
-  public void setSourceOutputLocation(IPath[] locations) {
-    this.outputLocation_ = locations[0].toString();
-
-    String[] paths = new String[locations.length];
-    for (int i = 0; i < locations.length; i++) {
-      paths[i] = locations[i].toString();
-      pathsTable_.put(paths[i], locations[i]);
-    }
-    sourceLocationCombo_.setItems(paths);
-    sourceLocationCombo_.select(0);
-
-  }
-
-  public IPath getSourceOutputLocation() {
-    IPath outputPath = (IPath) pathsTable_.get(outputLocation_);
-    return outputPath;
-  }
-
-  /**
-   * @return Returns the handlerClassNames.
-   */
-  public String[] getHandlerClassNames() {
-    
-    Vector handlerClasses = new Vector();
-    Enumeration e = wsDescToHandlers_.keys();
-    while (e.hasMoreElements()) {
-      
-      String wsDescName = (String)e.nextElement();
-      orderedHandlers_ = (Vector) wsDescToHandlers_.get(wsDescName);
-      
-      if (orderedHandlers_ != null) {
-        
-        for (int i = 0; i < orderedHandlers_.size(); i++) {
-          HandlerTableItem hti = (HandlerTableItem) orderedHandlers_.get(i);
-          handlerClasses.add(hti.getHandlerClassName());
-        }
-      }
-    }
-    return (String[])handlerClasses.toArray(new String[0]);
-  }
-
-  /**
-   * @param wsDescToHandlersArray_
-   *          The wsDescToHandlersArray_ to set.
-   */
-  public void setWsRefsToHandlers(Hashtable wsDescToHandlersArray) {
-
-    wsDescToHandlers_ = new Hashtable();
-    wsDescToPorts_ = new Hashtable();
-    try {
-
-      if (wsDescToHandlersArray != null) {
-        int sizeOfHandlers = wsDescToHandlersArray.size();
-        String[] wsRefs = new String[sizeOfHandlers];
-        // store the wsRefs
-        Enumeration wsDesc = wsDescToHandlersArray.keys();
-        while (wsDesc.hasMoreElements()) {
-          String wsDescName = (String) wsDesc.nextElement();
-
-          HandlerTableItem[] handlers = (HandlerTableItem[]) wsDescToHandlersArray.get(wsDescName);
-          // process the handlersTable
-          orderedHandlers_ = new Vector();
-          HashSet portNameVector = new HashSet();
-
-          for (int i = 0; i < handlers.length; i++) {
-            orderedHandlers_.add(handlers[i]);
-            String portName = handlers[i].getPortName();
-            portNameVector.add(new String(portName));
-          }
-          wsDescToHandlers_.put(wsDescName, orderedHandlers_);
-          wsDescToPorts_.put(wsDescName, (String[]) portNameVector.toArray(new String[0]));
-        }
-      }
-      populateHandlersTable();
-    }
-    catch (Exception e) {
-      e.printStackTrace();
-    }
-
-  }
-
-  public void setDescriptionName(String wsDescName) {
-    descriptionName_ = wsDescName;
-  }
-
-  public void setServiceDescNameToDescObj(Hashtable serviceDescNameToDescObj) {
-    this.serviceDescNameToDescObj_ = serviceDescNameToDescObj;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/HandlersDefaultingCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/HandlersDefaultingCommand.java
deleted file mode 100644
index 131928f..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/HandlersDefaultingCommand.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.consumption.ui.widgets;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.internal.webservice.WebServiceNavigatorGroupType;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.wsdl.Service;
-
-
-/**
- * HandlersDefaultingCommand
- * 
- * Determine if Handlers belongs to service or client side
- */
-public class HandlersDefaultingCommand extends AbstractHandlersWidgetDefaultingCmd {
-
-  private MessageUtils msgUtils_;
-
-  private boolean isClientHandler_ = false;
-  private boolean isServiceHandler_ = false;
-
-  public Status execute(Environment env) {
-    String pluginId = "org.eclipse.jst.ws.consumption.ui";
-    MessageUtils msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-    Status status = new SimpleStatus("");
-
-    IStructuredSelection selection = getInitialSelection();
-    if (selection != null && selection.size() == 1) {
-        Object obj = selection.getFirstElement();
-
-        if (obj instanceof WebServiceNavigatorGroupType) {
-          WebServiceNavigatorGroupType wsngt = (WebServiceNavigatorGroupType) obj;
-          Service service = (Service)wsngt.getWsdlService();
-          if (wsngt.getWsdlService()!=null){
-          	isServiceHandler_ = true;
-          }
-          
-          if (wsngt.getServiceRef()!=null){
-          	isClientHandler_ = true;
-          }
-
-        }
-      }
-    else {
-      status = new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_TASK_EXCEPTED"), Status.ERROR, null);
-      env.getStatusHandler().reportError(status);
-      return status;
-    }
-
-    return status;
-
-  }
-
-  
-/**
- * @return Returns the isClientHandler_.
- */
-public boolean getIsClientHandler() {
-	return isClientHandler_;
-}
-/**
- * @return Returns the isServiceHandler_.
- */
-public boolean getIsServiceHandler() {
-	return isServiceHandler_;
-}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ImportWSILWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ImportWSILWidget.java
deleted file mode 100644
index 716779c..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ImportWSILWidget.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.jst.ws.internal.consumption.ui.widgets;
-
-import java.net.MalformedURLException;
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.ws.internal.common.J2EEActionAdapterFactory;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.jst.ws.internal.consumption.ui.wsil.Arguments;
-import org.eclipse.jst.ws.internal.consumption.ui.wsil.TableViewerEditor;
-import org.eclipse.wst.ws.internal.wsil.AddWSDLToWSILCommand;
-import org.eclipse.jst.ws.internal.ui.common.DialogResourceBrowser;
-import org.eclipse.jst.ws.internal.ui.common.FileExtensionFilter;
-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.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.help.IWorkbenchHelpSystem;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.command.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.wsdl.internal.impl.ServiceImpl;
-import org.eclipse.wst.wsdl.util.WSDLResourceImpl;
-
-/**
-* Page for importing WSDL references into a WSIL in the workbench.
-*/
-public class ImportWSILWidget extends SimpleWidgetDataContributor
-{
-  /*CONTEXT_ID WSIL0001 for the WSIL Import Page*/
-  private final String INFOPOP_WSIL_IMPORT_PAGE = WebServiceConsumptionUIPlugin.ID + ".WSIL0001";
-
-  /*CONTEXT_ID WSIL0002 for the WSIL text field*/
-  private final String INFOPOP_WSIL_TEXT_WSIL = WebServiceConsumptionUIPlugin.ID + ".WSIL0002";
-
-  /*CONTEXT_ID WSIL0003 for the WSIL browse button*/
-  private final String INFOPOP_WSIL_BUTTON_BROWSE_WSIL = WebServiceConsumptionUIPlugin.ID + ".WSIL0003";
-
-  /*CONTEXT_ID WSIL0004 for the WSDL table*/
-  private final String INFOPOP_WSIL_TABLE_WSDL = WebServiceConsumptionUIPlugin.ID + ".WSIL0004";
-
-  private final String INSPECTION_WSIL = "inspection.wsil";
-
-  private Text wsil_;
-  private Button browse_;
-  private TableViewerEditor wsdls_;
-  
-  private MessageUtils msgUtils;
-  private IStructuredSelection selection;
-
-  /**
-  * Constructs a new page.
-  */
-  public ImportWSILWidget()
-  {
-    msgUtils = new MessageUtils(WebServiceConsumptionUIPlugin.ID + ".plugin", this);
-    //super(msgUtils.getMessage("PAGE_WSIL_IMPORT"), msgUtils.getMessage("TITLE_WSIL_IMPORT"), msgUtils.getMessage("DESC_WSIL_IMPORT"));
-  }
-
-  public WidgetDataEvents addControls(Composite parent, Listener statusListener)
-  {
-  	IWorkbenchHelpSystem helpSystem = PlatformUI.getWorkbench().getHelpSystem();
-  	
-    parent.setToolTipText(msgUtils.getMessage("TOOLTIP_WSIL_IMPORT_PAGE"));
-    helpSystem.setHelp(parent, INFOPOP_WSIL_IMPORT_PAGE);
-
-    Composite composite = new Composite(parent, SWT.NONE);
-    GridLayout gl = new GridLayout();
-    gl.numColumns = 3;
-    composite.setLayout(gl);
-    GridData gd = new GridData(GridData.GRAB_VERTICAL | GridData.VERTICAL_ALIGN_BEGINNING | GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_FILL);
-    gd.grabExcessVerticalSpace = true;
-    gd.grabExcessHorizontalSpace = true;
-    composite.setLayoutData(gd);
-
-    Label label = new Label(composite, SWT.WRAP);
-    label.setText(msgUtils.getMessage("LABEL_WSIL_URI"));
-    label.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-
-    wsil_ = new Text(composite, SWT.WRAP | SWT.SINGLE | SWT.BORDER);
-    gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
-    gd.widthHint = 256;
-    wsil_.setLayoutData(gd);
-    wsil_.addListener(SWT.Modify, statusListener);
-    wsil_.setToolTipText(msgUtils.getMessage("TOOLTIP_WSIL_TEXT_WSIL"));
-    helpSystem.setHelp(wsil_, INFOPOP_WSIL_TEXT_WSIL);
-
-    browse_ = new Button(composite, SWT.PUSH);
-    browse_.setText(msgUtils.getMessage("LABEL_BROWSE"));
-    browse_.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-    browse_.addListener(SWT.Selection,
-      new Listener()
-      {
-        public void handleEvent(Event event)
-        {
-          handleBrowseEvent(event);
-        }
-      }
-    );
-    browse_.setToolTipText(msgUtils.getMessage("TOOLTIP_WSIL_BUTTON_BROWSE_WSIL"));
-    helpSystem.setHelp(browse_, INFOPOP_WSIL_BUTTON_BROWSE_WSIL);
-
-    Composite wsdlComposite = new Composite(composite, SWT.NONE);
-    wsdlComposite.setLayout(new GridLayout());
-    gd = new GridData(GridData.FILL_BOTH);
-    gd.horizontalSpan = 3;
-    wsdlComposite.setLayoutData(gd);
-    label = new Label(wsdlComposite, SWT.WRAP);
-    label.setText(msgUtils.getMessage("LABEL_WSDL"));
-    label.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-    String[] columns = {msgUtils.getMessage("LABEL_WSDL_URI")};
-    wsdls_ = new TableViewerEditor(wsdlComposite, columns, new ArrayList(), "http://");
-    wsdls_.setToolTipText(msgUtils.getMessage("TOOLTIP_WSIL_TABLE_WSDL"));
-    wsdls_.setInfopop(INFOPOP_WSIL_TABLE_WSDL);
-    return this;
-  }
-
-  private IResource[] getWSDLResources()
-  {
-    ArrayList list = new ArrayList();
-    if (selection != null && !selection.isEmpty())
-    {
-      for (Iterator it = selection.iterator(); it.hasNext();)
-      {
-        Object object = it.next();
-        if ((object instanceof IFile) && ((IFile)object).getFileExtension() != null && ((IFile)object).getFileExtension().equals("wsdl"))
-          list.add(object);
-      }
-    }
-    IResource[] res = new IResource[list.size()];
-    for (int i = 0; i < res.length; i++)
-      res[i] = (IResource)list.get(i);
-    return res;
-  }
-
-  public void handleBrowseEvent(Event event)
-  {
-    DialogResourceBrowser dialog = new DialogResourceBrowser(browse_.getShell(), null, new FileExtensionFilter(new String[] {"wsil"}));
-    dialog.open();
-    IResource res = dialog.getFirstSelection();
-    if (res != null)
-    {
-      if (res instanceof IFile)
-        wsil_.setText(res.getFullPath().toString());
-      else
-        wsil_.setText(res.getFullPath().addTrailingSeparator().append(INSPECTION_WSIL).toString());
-    }
-  }
-
-  public Status getStatus()
-  {
-    if (!wsil_.getText().endsWith(".wsil"))
-      return new SimpleStatus("", msgUtils.getMessage("PAGE_MSG_INVALID_WSIL_FILE_NAME"), Status.ERROR);
-    else
-      return new SimpleStatus("");
-  }
-  
-  public void setInitialSelection(IStructuredSelection selection)
-  {
-    this.selection = selection;
-    ArrayList list = new ArrayList();
-    if (selection != null && !selection.isEmpty())
-    {
-      for (Iterator it = selection.iterator(); it.hasNext();)
-      {
-        Object object = it.next();
-        if ((object instanceof IFile) && ((IFile)object).getFileExtension() != null && ((IFile)object).getFileExtension().equals("wsdl"))
-          list.add(((IFile)object).getFullPath().toString());
-        if (object instanceof ServiceImpl)
-          list.add(J2EEActionAdapterFactory.getWSILPath(((ServiceImpl)(object))));	
-        if (object instanceof ServiceRef)
-          list.add(J2EEActionAdapterFactory.getWSILPath(((ServiceRef)(object))));		
-        if (object instanceof WSDLResourceImpl)
-          list.add(J2EEActionAdapterFactory.getWSILPath(((WSDLResourceImpl)(object))));	
-      }
-    }
-    wsdls_.setInput(list);
-    wsdls_.refresh();
-    if (list.size() > 0)
-    {
-      StringBuffer path = new StringBuffer(list.get(0).toString());
-      // change extension from .wsdl to .wsil
-      int length = path.length();
-      path = path.replace(length-4, length, "wsil");
-      wsil_.setText(path.toString());
-    }
-  }
-  
-  public Arguments getGenWSILArguments()
-  {
-    Arguments args = new Arguments();
-    String wsilPath = wsil_.getText();
-    if (wsilPath.indexOf(':') < 0)
-      args.add(AddWSDLToWSILCommand.ARG_WSIL, URI.createPlatformResourceURI(wsil_.getText()).toString());
-    else
-      args.add(AddWSDLToWSILCommand.ARG_WSIL, wsilPath);
-    TableItem[] items = wsdls_.getItems();
-    for (int i = 0; i < items.length; i++)
-    {
-      String uri = items[i].getText(0);
-      if (uri.indexOf(':') < 0)
-      {
-        IResource res = ResourceUtils.findResource(uri);
-        if (res != null)
-        {
-          try
-          {
-            uri = res.getLocation().toFile().toURL().toString();
-          }
-          catch (MalformedURLException murle)
-          {
-          	murle.getMessage();
-          }
-        }
-      }
-      args.add(AddWSDLToWSILCommand.ARG_WSDL, uri);
-    }
-    args.add(AddWSDLToWSILCommand.ARG_RESOLVE_WSDL, null);
-    return args;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/PreferencesSelectionWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/PreferencesSelectionWidget.java
deleted file mode 100644
index f108433..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/PreferencesSelectionWidget.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 Eclipse Public License v1.0
- * which accompanies 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.consumption.ui.widgets;
-
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.context.ResourceContext;
-import org.eclipse.wst.command.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.env.ui.widgets.WidgetDataEvents;
-
-
-public class PreferencesSelectionWidget extends SimpleWidgetDataContributor
-{    
-  private ResourceContext context_;
-  
-  /*CONTEXT_ID PWPR0003 for the Overwrite Files check box of the Project Page*/
-  private String INFOPOP_PWPR_CHECKBOX_OVERWRITE_FILES = "PWPR0003";
-  private Button overwriteFilesCheckbox_;
-  
-  /*CONTEXT_ID PWPR0004 for the Create Folders check box of the Project Page*/
-  private String INFOPOP_PWPR_CHECKBOX_CREATE_FOLDERS = "PWPR0004";
-  private Button createFoldersCheckbox_;
-  
-  /*CONTEXT_ID PWPR0015 for the Check Out Files check box of the Project Page*/
-  private String INFOPOP_PWPR_CHECKBOX_CHECKOUT_FILES = "PWPR0015";  
-  private Button checkoutFilesCheckbox_;
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.WidgetContributor#addControls(org.eclipse.swt.widgets.Composite, org.eclipse.swt.widgets.Listener)
-   */
-  public WidgetDataEvents addControls( Composite parent, Listener statusListener)
-  {
-    String       pluginId    = "org.eclipse.jst.ws.ui";
-    String       conPluginId = "org.eclipse.jst.ws.consumption.ui";
-    MessageUtils msgUtils    = new MessageUtils( pluginId + ".plugin", this );
-  	UIUtils      utils       = new UIUtils( msgUtils, conPluginId );
-  	
-    Composite resourcesGroup = utils.createComposite( parent, 1 );
-    
-    overwriteFilesCheckbox_ = utils.createCheckbox( resourcesGroup, "BUTTON_OVERWRITE_FILES",
-                                                    "TOOLTIP_PPRM_CHECKBOX_OVERWRITE_FILES", 
-                                                    INFOPOP_PWPR_CHECKBOX_OVERWRITE_FILES );
-                                                 
-    createFoldersCheckbox_ = utils.createCheckbox( resourcesGroup, "BUTTON_CREATE_FOLDERS",
-                                                   "TOOLTIP_PPRM_CHECKBOX_CREATE_FOLDERS" , 
-                                                   INFOPOP_PWPR_CHECKBOX_CREATE_FOLDERS );
-                                                      
-    checkoutFilesCheckbox_ = utils.createCheckbox( resourcesGroup, "BUTTON_CHECKOUT_FILES",
-                                                   "TOOLTIP_PPRM_CHECKBOX_CHECK_OUT", 
-                                                   INFOPOP_PWPR_CHECKBOX_CHECKOUT_FILES );
-    
-    return this;
-  }
-
-  public void setResourceContext( ResourceContext context )
-  { 
-    overwriteFilesCheckbox_.setSelection( context.isOverwriteFilesEnabled() );
-    createFoldersCheckbox_.setSelection( context.isCreateFoldersEnabled() );
-    checkoutFilesCheckbox_.setSelection( context.isCheckoutFilesEnabled() ); 
-    
-    context_ = context;
-  }
-  
-  public ResourceContext getResourceContext() 
-  {    
-    context_.setOverwriteFilesEnabled( overwriteFilesCheckbox_.getSelection() );
-    context_.setCreateFoldersEnabled( createFoldersCheckbox_.getSelection() );
-    context_.setCheckoutFilesEnabled( checkoutFilesCheckbox_.getSelection() );
-    
-    return context_;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/PublishToPrivateUDDICommandFragment.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/PublishToPrivateUDDICommandFragment.java
deleted file mode 100644
index 5c761a5..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/PublishToPrivateUDDICommandFragment.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.jst.ws.internal.consumption.ui.widgets;
-
-import org.eclipse.jst.ws.internal.consumption.ui.wizard.PrivateUDDIRegistryTypeRegistry;
-import org.eclipse.wst.command.env.core.CommandFactory;
-import org.eclipse.wst.command.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.env.core.fragment.AbstractCommandFragment;
-import org.eclipse.wst.command.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.env.ui.widgets.WidgetRegistry;
-
-
-public class PublishToPrivateUDDICommandFragment extends AbstractCommandFragment
-{
-  private DataMappingRegistry dataMappingRegistry;
-  private CanFinishRegistry canFinishRegistry;
-  private WidgetRegistry widgetRegistry;
-  private boolean publishToPrivateUDDI;
-  private CommandWidgetBinding privateUDDIBinding;
-  
-  public PublishToPrivateUDDICommandFragment()
-  {
-    super((CommandFactory)null, "");
-    privateUDDIBinding = PrivateUDDIRegistryTypeRegistry.getInstance().getPrivateUDDIRegistryType().getBinding();
-  }
-
-  /** 
-   * 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 (privateUDDIBinding != null && publishToPrivateUDDI && !PrivateUDDIRegistryTypeRegistry.getInstance().getPrivateUDDIRegistryType().isPrivateUDDIRegistryInstalled())
-    {
-      privateUDDIBinding.registerCanFinish(canFinishRegistry);
-      privateUDDIBinding.registerDataMappings(dataMappingRegistry);
-      privateUDDIBinding.registerWidgetMappings(widgetRegistry);
-      return privateUDDIBinding.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()
-  {
-    PublishToPrivateUDDICommandFragment fragment = new PublishToPrivateUDDICommandFragment();
-  	fragment.registerDataMappings(dataMappingRegistry);
-  	fragment.registerCanFinish(canFinishRegistry);
-  	fragment.registerWidgetMappings(widgetRegistry);
-  	fragment.setPublishToPrivateUDDI(publishToPrivateUDDI);
-  	return fragment;
-  }
-
-  public void setPublishToPrivateUDDI(boolean publish)
-  {
-    publishToPrivateUDDI = publish;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/PublishWSWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/PublishWSWidget.java
deleted file mode 100644
index 51f5b80..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/PublishWSWidget.java
+++ /dev/null
@@ -1,203 +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.consumption.ui.widgets;
-
-import java.util.Vector;
-
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.jst.ws.internal.consumption.ui.wizard.PrivateUDDIRegistryTypeRegistry;
-import org.eclipse.jst.ws.internal.consumption.ui.wizard.PublicUDDIRegistryTypeRegistry;
-import org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistryType;
-import org.eclipse.jst.ws.internal.ui.uddi.PrivateUDDIRegistryType;
-import org.eclipse.jst.ws.internal.explorer.LaunchOption;
-import org.eclipse.jst.ws.internal.explorer.LaunchOptions;
-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.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.env.ui.widgets.WidgetDataEvents;
-
-
-public class PublishWSWidget extends SimpleWidgetDataContributor
-{
-  /* CONTEXT_ID PWPB0001 for the UDDI Publish Page */
-  private String INFOPOP_PWPB_PAGE = WebServiceConsumptionUIPlugin.ID + ".PWPB0001";
-  /* CONTEXT_ID PWPB0002 for the UDDI Launch check box of the UDDI Publish Page */
-  private String INFOPOP_PWPB_CHECKBOX_WS_LAUNCH = WebServiceConsumptionUIPlugin.ID + ".PWPB0002";
-  private Button launchUDDICheckbox_;
-  private Button launchPrivateUDDICheckbox_;
-  private Label pubilcUDDIRegComboLabel_;
-  private Combo publicUDDIRegCombo_;
-  private MessageUtils msgUtils;
-  private Listener statusListener;
-  private Boolean publish;
-
-  public PublishWSWidget(boolean publish)
-  {
-    msgUtils = new MessageUtils(WebServiceConsumptionUIPlugin.ID + ".plugin", this);
-    this.publish = new Boolean(publish);
-  }
-
-  public WidgetDataEvents addControls(Composite parent, Listener statusListener)
-  {
-    this.statusListener = statusListener;
-    Listener selListener = new Listener()
-    {
-      public void handleEvent(Event event)
-      {
-        handleSelectionEvent(event);
-      }
-    };
-    parent.setToolTipText(msgUtils.getMessage("TOOLTIP_PWPB_PAGE"));
-    IWorkbenchHelpSystem helpSystem = PlatformUI.getWorkbench().getHelpSystem();
-    helpSystem.setHelp(parent, INFOPOP_PWPB_PAGE);
-    launchPrivateUDDICheckbox_ = new Button(parent, SWT.CHECK);
-    if (publish.booleanValue())
-      launchPrivateUDDICheckbox_.setText(msgUtils.getMessage("BUTTON_WS_PUBLISH_PRIVATE_UDDI"));
-    else
-      launchPrivateUDDICheckbox_.setText(msgUtils.getMessage("BUTTON_WS_FIND_PRIVATE_UDDI"));
-    launchPrivateUDDICheckbox_.setToolTipText(msgUtils.getMessage("TOOLTIP_PWPB_CHECKBOX_WS_LAUNCH"));
-    launchPrivateUDDICheckbox_.addListener(SWT.Selection, selListener);
-    helpSystem.setHelp(launchPrivateUDDICheckbox_, INFOPOP_PWPB_CHECKBOX_WS_LAUNCH);
-    launchUDDICheckbox_ = new Button(parent, SWT.CHECK);
-    if (publish.booleanValue())
-      launchUDDICheckbox_.setText(msgUtils.getMessage("BUTTON_WS_PUBLISH"));
-    else
-      launchUDDICheckbox_.setText(msgUtils.getMessage("BUTTON_WS_FIND"));
-    launchUDDICheckbox_.setToolTipText(msgUtils.getMessage("TOOLTIP_PWPB_CHECKBOX_WS_LAUNCH"));
-    launchUDDICheckbox_.addListener(SWT.Selection, selListener);
-    helpSystem.setHelp(launchUDDICheckbox_, INFOPOP_PWPB_CHECKBOX_WS_LAUNCH);
-    Composite c = new Composite(parent, SWT.NONE);
-    GridLayout gl = new GridLayout();
-    gl.numColumns = 3;
-    gl.marginHeight = 0;
-    gl.marginWidth = 0;
-    c.setLayout(gl);
-    GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
-    c.setLayoutData(gd);
-    new Label(c, SWT.WRAP);
-    pubilcUDDIRegComboLabel_ = new Label(c, SWT.WRAP);
-    pubilcUDDIRegComboLabel_.setText(msgUtils.getMessage("LABEL_PUBLIC_UDDI_REGISTRIES"));
-    publicUDDIRegCombo_ = new Combo(c, SWT.DROP_DOWN | SWT.READ_ONLY);
-    publicUDDIRegCombo_.setEnabled(false);
-    initPublicUDDI();
-    initPrivateUDDI();
-    return this;
-  }
-
-  private void initPublicUDDI()
-  {
-    PublicUDDIRegistryTypeRegistry reg = PublicUDDIRegistryTypeRegistry.getInstance();
-    PublicUDDIRegistryType[] types = reg.getAllPublicUDDIRegistryTypes();
-    for (int i = 0; i < types.length; i++)
-    {
-      if (publish.booleanValue())
-      {
-        // Ignore read-only registries.
-        String publishURL = types[i].getPublishURL();
-        if (publishURL == null || publishURL.indexOf("://") == -1)
-          continue;
-      }
-      publicUDDIRegCombo_.add(types[i].getName());
-    }
-    if (types.length > 0)
-      publicUDDIRegCombo_.setText(publicUDDIRegCombo_.getItem(0));
-  }
-
-  private void initPrivateUDDI()
-  {
-    if (!publish.booleanValue() && !PrivateUDDIRegistryTypeRegistry.getInstance().getPrivateUDDIRegistryType().isPrivateUDDIRegistryInstalled())
-      launchPrivateUDDICheckbox_.setEnabled(false);
-  }
-
-  private void handleSelectionEvent(Event event)
-  {
-    if (launchUDDICheckbox_ == event.widget)
-      publicUDDIRegCombo_.setEnabled(launchUDDICheckbox_.getSelection());
-    statusListener.handleEvent(event);
-  }
-
-  public void setPublishToPublicUDDI(boolean publish)
-  {
-    launchUDDICheckbox_.setSelection(publish);
-    publicUDDIRegCombo_.setEnabled(publish);
-  }
-
-  public void setPublishToPublicUDDI(Boolean publish)
-  {
-    setPublishToPublicUDDI(publish.booleanValue());
-  }
-
-  public void setPublishToPrivateUDDI(boolean publish)
-  {
-    launchPrivateUDDICheckbox_.setSelection(publish);
-  }
-
-  public void setPublishToPrivateUDDI(Boolean publish)
-  {
-    setPublishToPrivateUDDI(publish.booleanValue());
-  }
-
-  public boolean getPublishToPublicUDDI()
-  {
-    return launchUDDICheckbox_.getSelection();
-  }
-
-  public boolean getPublishToPrivateUDDI()
-  {
-    return launchPrivateUDDICheckbox_.getSelection();
-  }
-
-  public boolean getForceLaunchOutsideIDE()
-  {
-    return false;
-  }
-
-  public LaunchOption[] getLaunchOptions()
-  {
-    Vector launchOptionVector = new Vector();
-    if (launchUDDICheckbox_.getSelection())
-    {
-      PublicUDDIRegistryTypeRegistry reg = PublicUDDIRegistryTypeRegistry.getInstance();
-      int UDDIRegSelectionIndex = publicUDDIRegCombo_.getSelectionIndex();
-      if (UDDIRegSelectionIndex != -1)
-      {
-        String name = publicUDDIRegCombo_.getItem(UDDIRegSelectionIndex);
-        String id = reg.getPublicUDDIRegistryTypeIDByName(name);
-        PublicUDDIRegistryType type = reg.getPublicUDDIRegistryTypeByID(id);
-        launchOptionVector.add(new LaunchOption(LaunchOptions.INQUIRY_URL, type.getInquiryURL()));
-        launchOptionVector.add(new LaunchOption(LaunchOptions.PUBLISH_URL, type.getPublishURL()));
-      }
-    }
-    if (launchPrivateUDDICheckbox_.getSelection())
-    {
-      PrivateUDDIRegistryTypeRegistry privateReg = PrivateUDDIRegistryTypeRegistry.getInstance();
-      PrivateUDDIRegistryType privateType = privateReg.getPrivateUDDIRegistryType();
-      String[] privateInquiryURL = privateType.getPrivateUDDIRegistryInquiryAPI();
-      String[] privatePublishURL = privateType.getPrivateUDDIRegistryPublishAPI();
-      for (int i = 0; i < privateInquiryURL.length; i++)
-      {
-        launchOptionVector.add(new LaunchOption(LaunchOptions.INQUIRY_URL, privateInquiryURL[i]));
-        launchOptionVector.add(new LaunchOption(LaunchOptions.PUBLISH_URL, privatePublishURL[i]));
-      }
-    }
-    return (LaunchOption[]) launchOptionVector.toArray(new LaunchOption[0]);
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ServiceHandlersWidgetDefaultingCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ServiceHandlersWidgetDefaultingCommand.java
deleted file mode 100644
index a5ca18b..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ServiceHandlersWidgetDefaultingCommand.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.jst.ws.internal.consumption.ui.widgets;
-
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.internal.webservice.WebServiceNavigatorGroupType;
-import org.eclipse.jst.j2ee.internal.webservices.WebServiceEditModel;
-import org.eclipse.jst.j2ee.internal.webservices.WebServicesManager;
-import org.eclipse.jst.j2ee.webservice.wsdd.Handler;
-import org.eclipse.jst.j2ee.webservice.wsdd.PortComponent;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServices;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddResource;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.HandlerTableItem;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.wsdl.Service;
-import org.eclipse.wst.wsdl.internal.impl.ServiceImpl;
-import org.eclipse.wst.wsdl.util.WSDLResourceImpl;
-
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-
-/**
- * ServiceHandlersWidgetDefaultingCommand
- * 
- * Initialize and load the handlers data
- */
-public class ServiceHandlersWidgetDefaultingCommand extends AbstractHandlersWidgetDefaultingCmd {
-
-  private HandlerTableItem[] handlers_;
-  private MessageUtils msgUtils_;
-  private boolean isGenSkeletonEnabled_;
-  private IPath sourceOutputLocation_;
-  private WebServiceDescription wsDescription_;
-  private WsddResource wsddResource_;
-  private WebServicesManager webServicesManager_;
-  private IProject project_;
-  private Hashtable wsDescToHandlers_;
-  private Hashtable serviceDescNameToDescObj_;
-  private String descriptionName_ = null;
-
-  public Status execute(Environment env) {
-    String pluginId = "org.eclipse.jst.ws.consumption.ui";
-    msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-    Status status = new SimpleStatus("");
-
-    webServicesManager_ = new WebServicesManager();
-    IStructuredSelection selection = getInitialSelection();
-    if (selection == null) {
-      status = new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_TASK_EXCEPTED"), Status.ERROR, null);
-      env.getStatusHandler().reportError(status);
-      return status;
-    }
-
-    status = processHandlers(env);
-    return status;
-
-  }
-
-  public Status processHandlers(Environment env) {
-    try {
-      Vector handlers = new Vector();
-      wsDescToHandlers_ = new Hashtable();
-      serviceDescNameToDescObj_ = new Hashtable();
-      
-      WebServiceEditModel wsed = getWebServiceEditModel();
-      if (wsed == null)
-        wsddResource_ = getWsddResourceFromSelection();
-      else
-        wsddResource_ = wsed.getWebServicesXmlResource();
-
-      if (wsddResource_ == null) {
-        Status status = new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_TASK_EXCEPTED"), Status.ERROR, null);
-        env.getStatusHandler().reportError(status);
-        return status;
-      }
-
-      WebServices webServices = wsddResource_.getWebServices();
-      if (webServices != null) {
-        List wsDescriptions = wsddResource_.getWebServices().getWebServiceDescriptions();
-        for (int i = 0; i < wsDescriptions.size(); i++) {
-
-          wsDescription_ = (WebServiceDescription) wsDescriptions.get(i);
-          
-          List wsPortComponents = wsDescription_.getPortComponents();
-          for (int j = 0; j < wsPortComponents.size(); j++) {
-            PortComponent wsPort = (PortComponent) wsPortComponents.get(j);
-            String portName = wsPort.getPortComponentName();
-            List wsHandlers = wsPort.getHandlers();
-            HandlerTableItem[] handlerItems = new HandlerTableItem[wsHandlers.size()];            
-            for (int k = 0; k < wsHandlers.size(); k++) {
-
-              Handler wsHandler = (Handler) wsHandlers.get(k);
-
-              HandlerTableItem handlerItem = new HandlerTableItem();
-              handlerItem.setHandler(wsHandler);
-              handlerItem.setHandlerName(wsHandler.getHandlerName());
-              handlerItem.setHandlerClassName(wsHandler.getHandlerClass());
-              handlerItem.setPort(wsPort);
-              handlerItem.setPortName(portName);
-              handlerItem.setWsDescRef(wsDescription_);
-              handlerItems[k] = handlerItem;
-              
-              handlers.add(handlerItem);
-            }
-            String wsDescName = wsDescription_.getWebServiceDescriptionName();
-            wsDescToHandlers_.put(wsDescName, handlerItems);
-            serviceDescNameToDescObj_.put(wsDescName, wsDescription_);
-            
-          }
-
-        }
-
-        handlers_ = (HandlerTableItem[]) handlers.toArray(new HandlerTableItem[0]);
-      }
-    }
-    catch (Exception e) {
-      e.printStackTrace();
-      return new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_TASK_EXCEPTED"), Status.ERROR, e);
-    }
-    return new SimpleStatus("");
-  }
-
-  public HandlerTableItem[] getHandlers() {
-    return this.handlers_;
-  }
-
-  /**
-   * @return Returns the isGenSkeletonEnabled_.
-   */
-  public boolean getGenSkeletonEnabled() {
-    return true;
-  }
-
-  /**
-   * @return Returns the sourceOutputLocation_.
-   */
-  public IPath[] getSourceOutputLocation() {
-    IPath[] locations = null;
-    IProject project = getProject();
-
-    if (project != null) {
-      locations = ResourceUtils.getAllJavaSourceLocations(project);
-    }
-    else {
-      project = project_;
-      if (project != null) {
-        locations = ResourceUtils.getAllJavaSourceLocations(project);
-      }
-    }
-    return locations;
-  }
-
-  public WsddResource getWsddResource() {
-    return wsddResource_;
-  }
-
-  private WsddResource getWsddResourceFromSelection() {
-    IStructuredSelection initSel = getInitialSelection();
-    if (initSel != null && initSel.size() == 1) {
-      Object obj = initSel.getFirstElement();
-      if (obj instanceof ServiceImpl) {
-        // Service object
-        Service service = (Service) obj;
-        descriptionName_ = service.getQName().getLocalPart();
-        project_ = ProjectUtilities.getProject(service);
-        return webServicesManager_.getWsddResource(service);
-      }
-      else if (obj instanceof WSDLResourceImpl) {
-        // WSDL resource
-        WSDLResourceImpl res = (WSDLResourceImpl) obj;
-        project_ = ProjectUtilities.getProject(res);
-        List wsdlResources = webServicesManager_.getWSDLServices(res);
-        return webServicesManager_.getWsddResource((Service) wsdlResources.get(0));
-      }
-      else if (obj instanceof WebServiceNavigatorGroupType) {
-        WebServiceNavigatorGroupType wsngt = (WebServiceNavigatorGroupType) obj;
-        Service service = (Service)wsngt.getWsdlService();
-        descriptionName_ = service.getQName().getLocalPart();        
-        project_ = ProjectUtilities.getProject(service);
-        return webServicesManager_.getWsddResource(service);
-      }
-    }
-    
-    return null;
-
-  }
-
-  /**
-   * @deprecated
-   */
-  public WebServiceDescription getWsDescription() {
-    return wsDescription_;
-  }
-  
-  public String getDescriptionName(){
-    return descriptionName_;
-  }
-  
-  public Hashtable getWsRefsToHandlers(){
-    return wsDescToHandlers_;
-  }
-  
-  public Hashtable getServiceDescNameToDescObj(){
-    return this.serviceDescNameToDescObj_;
-  }
-  
-  
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ServiceHandlersWidgetOutputCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ServiceHandlersWidgetOutputCommand.java
deleted file mode 100644
index 405c5cd..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ServiceHandlersWidgetOutputCommand.java
+++ /dev/null
@@ -1,225 +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.consumption.ui.widgets;
-
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.List;
-
-import org.eclipse.jst.j2ee.webservice.internal.wsdd.impl.WsddFactoryImpl;
-import org.eclipse.jst.j2ee.webservice.wsdd.Handler;
-import org.eclipse.jst.j2ee.webservice.wsdd.PortComponent;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddFactory;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddResource;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.HandlerTableItem;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.common.internal.emf.utilities.EtoolsCopyUtility;
-
-/*
- * Provide a way to externalize the edited fields and create new handlers
- *  
- */
-public class ServiceHandlersWidgetOutputCommand extends SimpleCommand {
-
-  private List handlerTableItems;
-  private WebServiceDescription wsDescription_;
-  private WsddResource wsddResource_;
-  private Hashtable wsDescToHandlers_;
-  private Hashtable serviceDescNameToDescObj_;
-
-  public Status execute(Environment env) {
-
-    Status status = new SimpleStatus("");
-    try {
-      Enumeration e = wsDescToHandlers_.keys();
-      while (e.hasMoreElements()) {
-
-        Hashtable wsPortsTable = new Hashtable();
-        Hashtable wsPortToHandlerTable = new Hashtable();
-
-        String serviceDescName = (String) e.nextElement();
-        // load PortName -> PortComponent table
-        WebServiceDescription wsDescription_ = (WebServiceDescription) serviceDescNameToDescObj_.get(serviceDescName);
-        if (wsDescription_ != null) {
-
-          List wsPorts = wsDescription_.getPortComponents();
-          for (int k = 0; k < wsPorts.size(); k++) {
-            PortComponent port = (PortComponent) wsPorts.get(k);
-            wsPortsTable.put(port.getPortComponentName(), port);
-            wsPortToHandlerTable.put(port.getPortComponentName(), new ArrayList());
-          }
-        }
-
-        List handlerTableItems = (List) wsDescToHandlers_.get(serviceDescName);
-        if (handlerTableItems != null) {
-
-          WsddFactory wsddFactory = new WsddFactoryImpl();
-
-          //form port components tables first
-          for (int i = 0; i < handlerTableItems.size(); i++) {
-
-            HandlerTableItem hti = (HandlerTableItem) handlerTableItems.get(i);
-            PortComponent wsPort = (PortComponent) hti.getPort();
-            if (wsPort == null) {
-              //find it
-              if (wsPortsTable.get(hti.getPortName()) != null)
-                wsPort = (PortComponent) wsPortsTable.get(hti.getPortName());
-              else {
-                // create it; should not get into here
-                wsPort = wsddFactory.createPortComponent();
-                wsPort.setPortComponentName(hti.getPortName());
-                wsPortsTable.put(wsPort.getPortComponentName(), wsPort);
-              }
-            }
-            wsPortToHandlerTable.put(wsPort.getPortComponentName(), new ArrayList());
-          }
-
-          // form Handler and ports table
-          for (int i = 0; i < handlerTableItems.size(); i++) {
-
-            HandlerTableItem hti = (HandlerTableItem) handlerTableItems.get(i);
-            String portName = hti.getPortName();
-
-            PortComponent port = (PortComponent) wsPortsTable.get(portName);
-            if (port == null) return status;
-
-            List existingHandlers = port.getHandlers();
-
-            Object handler = hti.getHandler();
-            if (!existingHandlers.contains(handler)) {
-              // create it
-              Handler newHandler = wsddFactory.createHandler();
-              newHandler.setHandlerName(hti.getHandlerName());
-              newHandler.setHandlerClass(hti.getHandlerClassName());
-              ((List) wsPortToHandlerTable.get(portName)).add(newHandler);
-
-            }
-            else if (handler instanceof Handler) {
-              // clone it
-              EtoolsCopyUtility copyUtil = new EtoolsCopyUtility();
-              copyUtil.setCopyAdapters(true);
-              Handler clonedHandler = (Handler) copyUtil.copy((Handler) handler);
-              ((List) wsPortToHandlerTable.get(portName)).add(clonedHandler);
-            }
-          }
-
-        }
-
-        // remove existing handlers from ports
-        removeExistingHandlers(wsPortsTable, wsPortToHandlerTable);
-
-        // add ports to wsDescription
-        addPortsToDescriptions(wsPortsTable, wsDescription_);
-
-        // add handlers to ports
-        addHandlersToPorts(wsPortsTable, wsPortToHandlerTable);
-      }
-      if (wsddResource_ != null) {
-        wsddResource_.save(new HashMap());
-      }
-
-    }
-    catch (Exception e) {
-      //status = new
-      e.printStackTrace();
-    }
-    return status;
-  }
-
-  private void removeExistingHandlers(Hashtable portsTable, Hashtable portsToHandlersTable) {
-    try {
-      int key = 0;
-      Enumeration ports = portsToHandlersTable.keys();
-      while (ports.hasMoreElements()) {
-        String portName = (String) ports.nextElement();
-        Object port = portsTable.get(portName);
-        if (port != null && port instanceof PortComponent) {
-          List handlers = ((PortComponent) port).getHandlers();
-          handlers.clear();
-        }
-      }
-    }
-    catch (Exception e) {
-      e.printStackTrace();
-    }
-  }
-
-  private void addPortsToDescriptions(Hashtable portsTable, WebServiceDescription wsDescription_) {
-    try {
-      Enumeration ports = portsTable.keys();
-      while (ports.hasMoreElements()) {
-        String portName = (String) ports.nextElement();
-        // newly edited port
-        Object port = portsTable.get(portName);
-        
-        // existing port
-        List emfPorts = wsDescription_.getPortComponents();
-        if (!emfPorts.contains(port) && port != null && port instanceof PortComponent) {
-          emfPorts.add((PortComponent) port);
-        }
-      }
-    }
-
-    catch (Exception e) {
-      e.printStackTrace();
-    }
-  }
-
-  private void addHandlersToPorts(Hashtable portsTable, Hashtable portsToHandlersTable) {
-    try {
-      int key = 0;
-      Enumeration ports = portsToHandlersTable.keys();
-      while (ports.hasMoreElements()) {
-        String portName = (String) ports.nextElement();
-        Object port = portsTable.get(portName);
-        if (port != null && port instanceof PortComponent) {
-          List handlers = (List) portsToHandlersTable.get(portName);
-
-          List modelHandlers = ((PortComponent) port).getHandlers();
-          modelHandlers.addAll(handlers);
-        }
-      }
-    }
-    catch (Exception e) {
-      e.printStackTrace();
-    }
-  }
-
-  /**
-   * @param handlerTableItems
-   *          The handlerTableItems to set.
-   */
-  public void setHandlersList(List handlerTableItems) {
-    this.handlerTableItems = handlerTableItems;
-  }
-
-  public void setWsDescToHandlers(Hashtable wsDescToHandlers) {
-    this.wsDescToHandlers_ = wsDescToHandlers;
-  }
-
-//  public void setWsDescription(WebServiceDescription wsDesc) {
-//    this.wsDescription_ = wsDesc;
-//  }
-
-  public void setWsddResource(WsddResource wsddRes) {
-    this.wsddResource_ = wsddRes;
-  }
-
-  public void setServiceDescNameToDescObj(Hashtable serviceDescNameToDescObj) {
-    this.serviceDescNameToDescObj_ = serviceDescNameToDescObj;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/TableViewerWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/TableViewerWidget.java
deleted file mode 100644
index c4d8144..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/TableViewerWidget.java
+++ /dev/null
@@ -1,619 +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.consumption.ui.widgets;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.common.PropertiesResourceFilter;
-import org.eclipse.jst.ws.internal.ui.dialog.DialogUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.TableEditor;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.KeyListener;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.MouseListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.events.TraverseEvent;
-import org.eclipse.swt.events.TraverseListener;
-import org.eclipse.swt.graphics.Image;
-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.Composite;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.command.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.env.ui.widgets.WidgetDataEvents;
-
-
-public class TableViewerWidget extends SimpleWidgetDataContributor
-{
-  private int DEFAULT_TABLE_HEIGHT_HINT = 100;
-  private int DEFAULT_COLUMN_WIDTH = 80;
-
-  public static byte MAP_ONE_TO_ONE = 3;
-  public static byte MAP_MANY_TO_ONE = 1;
-  public static byte MAP_MANY_TO_MANY = 0;
-
-  private String[] columns_;
-  private TableViewer tableViewer_;
-  private Table table_;
-  private TableEditor editor_;
-  private TableEditorListener tableEditorListener_;
-  private Text text_;
-  private Button import_;
-  private Button add_;
-  private Button remove_;
-  
-  private Composite parent_;
-  private Listener  statusListener_;
-
-  private String message = null;
-  private byte rescriction = MAP_MANY_TO_MANY;
-
-  private List values_;
-  private Object defaultValue_;
-
-  private PropertiesResourceFilter filter_ = new PropertiesResourceFilter();
-
-  public TableViewerWidget(String[] columns, List initValues, Object defaultValue, byte rescriction)
-  {
-	columns_ = columns;
-	values_ = new ArrayList();
-	if (initValues != null && initValues.size() > 0)
-	  values_.addAll(initValues);
-	defaultValue_ = (defaultValue != null) ? defaultValue : new String("");
-	this.rescriction = rescriction;
-  }
-
-  public WidgetDataEvents addControls( Composite parent, Listener statusListener )
-  { 
-    parent_         = parent;
-    statusListener_ = statusListener;
-    
-    String       pluginId = "org.eclipse.jst.ws.consumption.ui";
-    MessageUtils msgUtils = new MessageUtils( pluginId + ".plugin", this );
-    
-	Composite  composite = new Composite(parent, SWT.NONE);
-	GridLayout gl        = new GridLayout();
-	
-	gl.marginHeight = 0;
-	gl.marginWidth = 0;
-	composite.setLayout(gl);
-	composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-	table_ = new Table(composite, SWT.SINGLE | SWT.FULL_SELECTION | SWT.BORDER);
-	GridData gd = new GridData(GridData.FILL_BOTH);
-	gd.heightHint = DEFAULT_TABLE_HEIGHT_HINT;
-	table_.setLayoutData(gd);
-	table_.setHeaderVisible(true);
-	table_.setLinesVisible(true);
-	TableLayout tableLayout = new TableLayout();
-	int maxWidth = DEFAULT_COLUMN_WIDTH;
-	for (int i = 0; i < columns_.length; i++)
-	{
-	  TableColumn tableColumn = new TableColumn(table_, SWT.NONE);
-	  tableColumn.setText(columns_[i]);
-	  tableColumn.pack();
-	  int tableColumnWidth = Math.max(DEFAULT_COLUMN_WIDTH, tableColumn.getWidth());
-	  maxWidth = Math.max(maxWidth, tableColumnWidth);
-	  ColumnWeightData columnData = new ColumnWeightData(tableColumnWidth, tableColumnWidth, true);
-	  tableLayout.addColumnData(columnData);
-	}
-	table_.setLayout(tableLayout);
-	// initialize the table editor
-	editor_ = new TableEditor(table_);
-	// The editor must have the same size as the cell and must
-	// not be any smaller than 50 pixels.
-	editor_.horizontalAlignment = SWT.LEFT;
-	editor_.grabHorizontal = true;
-	editor_.minimumWidth = maxWidth;
-	tableEditorListener_ = new TableEditorListener();
-	table_.addMouseListener(tableEditorListener_);
-	tableViewer_ = new TableViewer(table_);
-	tableViewer_.getControl().addKeyListener(
-	  new KeyListener()
-	  {
-		public void keyPressed(KeyEvent e)
-		{
-		  int asciiDel = (int)e.character;
-		  // Del
-		  if (asciiDel == 127) 
-			handleDeleteKeyPressed();
-                // Enter or space
-                if (((int)e.character) == 13 || ((int)e.character) == 32)
-                  tableEditorListener_.editSelection();
-		}
-		public void keyReleased(KeyEvent e)
-		{
-		}
-	  }
-	);
-	tableViewer_.setContentProvider(new ListContentProvider());
-	tableViewer_.setLabelProvider(new ListLabelProvider());
-	tableViewer_.setInput(values_);
-	tableViewer_.addSelectionChangedListener(
-	  new ISelectionChangedListener()
-	  {
-		public void selectionChanged(SelectionChangedEvent event)
-		{
-		  enableRemove(true);
-		}
-	  }
-	);
-
-	Composite buttonComposite = new Composite(composite, SWT.NONE);
-	gl = new GridLayout();
-	gl.numColumns = 3;
-	gl.makeColumnsEqualWidth = true;
-	buttonComposite.setLayout(gl);
-	buttonComposite.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_BEGINNING));
-
-	import_ = new Button(buttonComposite, SWT.PUSH);
-	import_.setText(msgUtils.getMessage("LABEL_IMPORT"));
-	import_.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-	import_.addSelectionListener(
-	  new SelectionListener()
-	  {
-		public void widgetSelected(SelectionEvent event)
-		{
-		  handleImportButtonSelected(event);
-		}
-		public void widgetDefaultSelected(SelectionEvent event)
-		{
-		}
-	  }
-	);
-	
-	add_ = new Button(buttonComposite, SWT.PUSH);
-	add_.setText(msgUtils.getMessage("LABEL_ADD"));
-	add_.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-	add_.addSelectionListener(
-	  new SelectionListener()
-	  {
-		public void widgetSelected(SelectionEvent event)
-		{
-		  handleAddButtonSelected(event);
-		}
-		public void widgetDefaultSelected(SelectionEvent event)
-		{
-		}
-	  }
-	);
-
-	
-	remove_ = new Button(buttonComposite, SWT.PUSH);
-	remove_.setText(msgUtils.getMessage("LABEL_REMOVE"));
-	remove_.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-	remove_.addSelectionListener(
-	  new SelectionListener()
-	  {
-		public void widgetSelected(SelectionEvent event)
-		{
-		  handleRemoveButtonSelected(event);
-		}
-		public void widgetDefaultSelected(SelectionEvent event)
-		{
-		}
-	  }
-	);
-	enableRemove(false);
-	
-	return this;
-  }
-
-  private void enableRemove(boolean enabled)
-  {
-	remove_.setEnabled(enabled && !tableViewer_.getSelection().isEmpty());
-  }
-
-  private void handleImportButtonSelected(SelectionEvent event)
-  {
-	IResource resource = DialogUtils.browseResources(
-	  parent_.getShell(),
-	  ResourceUtils.getWorkspaceRoot(),
-	  null,
-	  filter_
-	);
-	if (resource != null && resource instanceof IFile)
-	{
-	  try
-	  {
-		Properties props = new Properties();
-		props.load(((IFile)resource).getContents());
-		Set set = props.entrySet();
-		java.util.List list = new LinkedList();
-		Iterator i = set.iterator();
-		while (i.hasNext())
-		{
-		  Map.Entry me = (Map.Entry)i.next();
-		  String key = (String)me.getKey();
-		  String val = (String)me.getValue();
-		  list.add(new String[] {key,val});
-		}
-		values_.addAll(list);
-	  }
-	  catch (Exception e)
-	  {
-	    // TODO Report some error here.
-	  }
-	}
-	refresh();
-  }
-
-  private void handleAddButtonSelected(SelectionEvent event)
-  {
-	values_.add(defaultValue_);
-	refresh();
-	setSelectionAsObject(values_.get(table_.getItemCount()-1));
-	tableEditorListener_.editSelection();
-  }
-
-  private void handleRemoveButtonSelected(SelectionEvent event)
-  {
-	handleDeleteKeyPressed();
-  }
-
-  private void handleDeleteKeyPressed()
-  {
-	internalDispose();
-	ISelection selection = tableViewer_.getSelection();
-	if (selection != null && !selection.isEmpty() && (selection instanceof IStructuredSelection))
-	{
-	  int selectionIndex = table_.getSelectionIndex();
-	  int selectionCount = table_.getItemCount();
-	  values_.remove(selectionIndex);
-	  if (selectionIndex < selectionCount-1)
-		setSelectionAsObject(values_.get(selectionIndex));
-	  else if (selectionCount -2 >= 0)
-		setSelectionAsObject(values_.get(selectionCount-2));
-	  refresh();
-	}
-  }
-
-  private void internalRefresh()
-  {
-	// synchronize text field, previously selected table cell and model (inputObject)
-	if (text_ != null)
-	{
-	  TableItem oldTableItem = editor_.getItem();
-	  int oldColumnIndex = editor_.getColumn();
-	  if (oldTableItem != null && oldColumnIndex >= 0 && oldColumnIndex < columns_.length)
-	  {
-		String oldText = text_.getText();
-		oldTableItem.setText(oldColumnIndex, oldText);
-		int oldRowIndex = table_.indexOf(oldTableItem);
-		values_.set(oldRowIndex, new String[] {oldTableItem.getText(0), oldTableItem.getText(1)});
-	  }
-	}
-	checkMappingConstraints();
-	statusListener_.handleEvent( null );
-  }
-
-  private void checkMappingConstraints() {
-
-	HashMap map = new HashMap();
-    String       pluginId = "org.eclipse.jst.ws.consumption.ui";
-    MessageUtils msgUtils = new MessageUtils( pluginId + ".plugin", this );
-    
-	for(int cnt=0; cnt<values_.size(); cnt++){
-		String[] value = (String[])values_.get(cnt);
-		if(map.containsKey(value[0]) && ((rescriction & 1)!=0)){
-			message = msgUtils.getMessage("MSG_MAPPING_DUPLICATE_ENTRIES", new String[]{columns_[0],columns_[1]});
-			return;
-		}
-		if(map.containsValue(value[1]) && ((rescriction & 2)!=0)){
-			message = msgUtils.getMessage("MSG_MAPPING_DUPLICATE_ENTRIES", new String[]{columns_[1],columns_[0]});
-			return;
-		}
-		map.put(value[0],value[1]);
-
-	}
-	message = null;
-
-  }
-
-  public Status getStatus()
-  {
-    return message == null ? new SimpleStatus("") : 
-                             new SimpleStatus( "", message, Status.ERROR );
-  }
-
-  private void setSelectionAsObject(Object object)
-  {
-	tableViewer_.setSelection(new StructuredSelection(object), true);
-  }
-
-  public void refresh()
-  {
-	internalRefresh();
-	tableViewer_.refresh();
-  }
-
-  public TableItem[] getItems()
-  {
-	//internalRefresh();
-	return table_.getItems();
-  }
-
-  public void setEnabled(boolean enabled)
-  {
-	add_.setEnabled(enabled);
-	enableRemove(enabled);
-  }
-
-  public void dispose()
-  {
-	internalDispose();
-	if (editor_ != null)
-	  editor_.dispose();
-	if (table_ != null)
-	  table_.dispose();
-	if (add_ != null)
-	  add_.dispose();
-	if (remove_ != null)
-	  remove_.dispose();
-  }
-
-  private void internalDispose()
-  {
-	if (text_ != null)
-	  text_.dispose();
-	text_ = null;
-  }
-
-  protected class TableEditorListener implements MouseListener
-  {
-	private int currSelectionIndex_;
-    private int editRow_;
-    private int editColumn_;
-
-	public TableEditorListener()
-	{
-	  super();
-	  currSelectionIndex_ = -1;
-         editRow_ = -1;
-         editColumn_ = -1;
-	}
-
-	public void mouseDoubleClick(MouseEvent e)
-	{
-	  mouseDown(e);
-	}
-
-	public void mouseDown(MouseEvent e)
-	{
-	  // refresh table
-	  internalRefresh();
-	  // Clean up previous text editor control
-	  internalDispose();
-	  // update table
-	  if (table_.isFocusControl())
-	  {
-		int selectedRowIndex = getSelectedRow(table_, e.y);
-		if (currSelectionIndex_ != -1 && selectedRowIndex != -1 && currSelectionIndex_ == selectedRowIndex)
-		{
-		  TableItem tableItem = table_.getItem(selectedRowIndex);
-		  int selectedColumnIndex = getSelectedColumn(tableItem, e.x, e.y);
-		  if (selectedColumnIndex != -1 && (text_ == null || text_.isDisposed() || selectedColumnIndex != editor_.getColumn()))
-			editSelection(selectedRowIndex, selectedColumnIndex);
-		}
-		currSelectionIndex_ = selectedRowIndex;
-	  }
-	}
-
-	public void mouseUp(MouseEvent e)
-	{
-	}
-
-	private int getSelectedRow(Table table, int y)
-	{
-	  TableItem[] tableItems = table.getItems();
-	  for (int i = 0; i < tableItems.length; i++)
-	  {
-		Rectangle rectangle = tableItems[i].getBounds(0);
-		if (rectangle != null && y >= rectangle.y && y < (rectangle.y + rectangle.height))
-		  return i;
-	  }
-	  return -1;
-	}
-
-	private int getSelectedColumn(TableItem tableItem, int x, int y)
-	{
-	  for (int i = 0; i < columns_.length; i++)
-	  {
-		if (tableItem.getBounds(i).contains(x, y))
-		  return i;
-	  }
-	  return -1;
-	}
-
-	private void editSelection(int row, int column)
-	{
-         editRow_ = row;
-         editColumn_ = column;
-	  TableItem tableItem = table_.getItem(row);
-	  // Setup adapter for the new selection
-	  text_ = new Text(table_, SWT.NONE);
-	  String text = tableItem.getText(column);
-	  text_.setText((text != null) ? text : "");
-         text_.addKeyListener(new KeyListener()
-           {
-             public void keyPressed(KeyEvent e)
-             {
-               // Esc
-               if (((int)e.character) == 27)
-                 cancelSelection();
-             }
-             public void keyReleased(KeyEvent e)
-             {
-             }
-           }
-         );
-         text_.addTraverseListener(new TraverseListener()
-           {
-             public void keyTraversed(TraverseEvent e)
-             {
-               if (e.detail == SWT.TRAVERSE_TAB_NEXT)
-                 traverseTabNext();
-               else if (e.detail == SWT.TRAVERSE_TAB_PREVIOUS)
-                 traverseTabPrevious();
-             }
-           }
-         );
-	  editor_.setEditor(text_, tableItem, column);
-	  text_.setFocus();
-	  text_.selectAll();
-	}
-
-    protected void traverseTabNext()
-    {
-      internalRefresh();
-      internalDispose();
-      if (!(editRow_ == table_.getItems().length-1 && editColumn_ == columns_.length-1))
-      {
-        if (editColumn_ < columns_.length-1)
-          editColumn_++;
-        else
-        {
-          editColumn_ = 0;
-          editRow_++;
-          table_.select(editRow_);
-        }
-        editSelection(editRow_, editColumn_);
-      }
-    }
-
-    protected void traverseTabPrevious()
-    {
-      internalRefresh();
-      internalDispose();
-      if (!(editRow_ == 0 && editColumn_ == 0))
-      {
-        if (editColumn_ > 0)
-          editColumn_--;
-        else
-        {
-          editColumn_ = columns_.length-1;
-          editRow_--;
-          table_.select(editRow_);
-        }
-        editSelection(editRow_, editColumn_);
-      }
-    }
-
-    public void cancelSelection()
-    {
-      internalDispose();
-      internalRefresh();
-    }
-
-	public void editSelection()
-	{
-	  int selectedRowIndex = table_.getSelectionIndex();
-	  if (selectedRowIndex != -1 && columns_.length > 0)
-	  {
-		// refresh table
-		internalRefresh();
-		// Clean up any previous editor control
-		internalDispose();
-		editSelection(selectedRowIndex, 0);
-	  }
-	  currSelectionIndex_ = selectedRowIndex;
-	}
-  }
-
-  protected class ListContentProvider implements IStructuredContentProvider
-  {
-	public void dispose()
-	{
-	}
-
-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput)
-	{
-	  tableViewer_.add(getElements(newInput));
-	}
-
-	public Object[] getElements(Object inputElement)
-	{
-	  if (inputElement instanceof List)
-	  {
-		List list = (List)inputElement;
-		Object[] objects = new Object[list.size()];
-		for (int i = 0; i < objects.length; i++)
-		  objects[i] = list.get(i);
-		return objects;
-	  }
-	  else
-		return new Object[0];
-	}
-  }
-
-  protected class ListLabelProvider implements ITableLabelProvider
-  {
-	public Image getColumnImage(Object element, int columnIndex)
-	{
-	  return null;
-	}
-
-	public String getColumnText(Object element, int columnIndex)
-	{
-		return ((String[])element)[columnIndex];	  	
-	}
-
-	public void addListener(ILabelProviderListener listener)
-	{
-	}
-
-	public void removeListener(ILabelProviderListener listener)
-	{
-	}
-
-	public boolean isLabelProperty(Object element, String property)
-	{
-	  return true;
-	}
-
-	public void dispose()
-	{
-	}
-  }
- }
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionConditionCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionConditionCommand.java
deleted file mode 100644
index b585ce9..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionConditionCommand.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.consumption.ui.widgets;
-
-import org.eclipse.jst.ws.internal.consumption.ui.wsil.DialogWWWAuthentication;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Condition;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.ws.parser.discovery.WebServicesParserExt;
-import org.eclipse.wst.ws.parser.wsil.WWWAuthenticationException;
-import org.eclipse.wst.ws.parser.wsil.WebServiceEntity;
-import org.eclipse.wst.ws.parser.wsil.WebServicesParser;
-
-
-public class WSDLSelectionConditionCommand extends SimpleCommand implements Condition
-{
-  private String pluginId_;
-  private MessageUtils msgUtils_;
-  private WebServicesParser webServicesParser;
-  private String webServiceURI;
-  private String httpBasicAuthUsername;
-  private String httpBasicAuthPassword;
-  private boolean needWSDLSelectionTreeWidget;
-  
-  public WSDLSelectionConditionCommand()
-  {
-    pluginId_ = "org.eclipse.jst.ws.consumption.ui";
-    msgUtils_ = new MessageUtils( pluginId_ + ".plugin", this );
-  }
-
-  public void setWebServicesParser(WebServicesParser webServicesParser)
-  {
-    this.webServicesParser = webServicesParser;
-  }
-
-  public WebServicesParser getWebServicesParser()
-  {
-  	if (webServicesParser == null)
-  	  webServicesParser = new WebServicesParserExt();
-  	return webServicesParser;
-  }
-  
-  public Status execute(Environment env)
-  {
-  	needWSDLSelectionTreeWidget = false;
-  	WebServicesParser parser = getWebServicesParser();
-  	parser.setURI(webServiceURI);
-    try
-    {
-      parser.parse(WebServicesParser.PARSE_WSIL | WebServicesParser.PARSE_DISCO | WebServicesParser.PARSE_LINKS);
-    }
-    catch (WWWAuthenticationException wwwae)
-    {
-      DialogWWWAuthentication dialog = new DialogWWWAuthentication(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell());
-      dialog.handleWWWAuthentication(wwwae);
-      String username = dialog.getUsername();
-      String password = dialog.getPassword();
-      httpBasicAuthUsername = username;
-      httpBasicAuthPassword = password;
-      if (username != null && password != null)
-      {
-        parser.setHTTPBasicAuthUsername(username);
-        parser.setHTTPBasicAuthPassword(password);
-        try
-        {
-          parser.parse(WebServicesParser.PARSE_WSIL | WebServicesParser.PARSE_DISCO | WebServicesParser.PARSE_LINKS);
-        }
-        catch (Throwable t)
-        {
-          return new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_URI_NOT_RESOLVABLE", new Object[] {webServiceURI}), Status.ERROR, t);
-        }
-        finally
-        {
-          parser.setHTTPBasicAuthUsername(null);
-          parser.setHTTPBasicAuthPassword(null);
-        }
-      }
-    }
-    catch (Throwable t)
-    {
-      return new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_URI_NOT_RESOLVABLE", new Object[] {webServiceURI}), Status.ERROR, t);
-    }
-    WebServiceEntity wsEntity = parser.getWebServiceEntityByURI(webServiceURI);
-    if (wsEntity != null)
-    {
-      int type = wsEntity.getType();
-      if (type != WebServiceEntity.TYPE_WSDL)
-      	needWSDLSelectionTreeWidget = true;
-    }
-    return new SimpleStatus("");
-  }
-  
-  public boolean evaluate()
-  {
-    return needWSDLSelectionTreeWidget;
-  }
-
-  public String getWebServiceURI()
-  {
-    return webServiceURI;
-  }
-
-  public void setWebServiceURI(String webServiceURI)
-  {
-    this.webServiceURI = webServiceURI;
-  }
-  
-  public String getWsdlURI()
-  {
-    return getWebServiceURI();
-  }
-/**
- * @return Returns the httpBasicAuthPassword.
- */
-public String getHttpBasicAuthPassword() {
-	return httpBasicAuthPassword;
-}
-/**
- * @return Returns the httpBasicAuthUsername.
- */
-public String getHttpBasicAuthUsername() {
-	return httpBasicAuthUsername;
-}
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionOutputCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionOutputCommand.java
deleted file mode 100644
index 0a20fab..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionOutputCommand.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.jst.ws.internal.consumption.ui.widgets;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.ws.parser.discovery.WebServicesParserExt;
-import org.eclipse.wst.ws.parser.wsil.WebServicesParser;
-
-
-public class WSDLSelectionOutputCommand extends SimpleCommand
-{
-  private WebServicesParser webServicesParser;
-  private String wsdlURI;
-  private IProject project;
-  
-  /**
-   * @return Returns the project.
-   */
-  public IProject getProject()
-  {
-    return project;
-  }
-
-  /**
-   * @param project
-   *          The project to set.
-   */
-  public void setProject(IProject project)
-  {
-    this.project = project;
-  }
-  
-  public String getWsdlURI()
-  {
-    return wsdlURI;
-  }
-
-  public void setWsdlURI(String wsdlURI)
-  {
-    this.wsdlURI = wsdlURI;
-  }
-
-  /**
-   * @return Returns the webServicesParser.
-   */
-  public WebServicesParser getWebServicesParser()
-  {
-    if (webServicesParser != null)
-      return webServicesParser;
-    else
-      return new WebServicesParserExt();
-  }
-
-  /**
-   * @param webServicesParser to set.
-   */
-  public void setWebServicesParser(WebServicesParser webServicesParser)
-  {
-    this.webServicesParser = webServicesParser;
-  }
-
-  public Status execute(Environment env)
-  {
-    if (wsdlURI != null && getWebServicesParser().getWSDLDefinition(wsdlURI) != null)
-      return new SimpleStatus("");
-    else
-    {
-      MessageUtils msgUtils = new MessageUtils("org.eclipse.jst.ws.consumption.ui.plugin", this);
-      Status status = new SimpleStatus("", msgUtils.getMessage("PAGE_MSG_SELECTION_MUST_BE_WSDL"), Status.ERROR);
-      env.getStatusHandler().reportError(status);
-      return status;
-    }
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionTreeWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionTreeWidget.java
deleted file mode 100644
index 3b5b7b0..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionTreeWidget.java
+++ /dev/null
@@ -1,295 +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.consumption.ui.widgets;
-
-import java.util.List;
-
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-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.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-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.Tree;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.command.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.ws.parser.wsil.WebServiceEntity;
-import org.eclipse.wst.ws.parser.wsil.WebServicesParser;
-
-
-/**
-* This wizard page allows the user to select the WSDL URI for consumption
-*/
-public class WSDLSelectionTreeWidget extends SimpleWidgetDataContributor
-{
-  private String pluginId_;
-  private MessageUtils msgUtils_;
-
-  /*CONTEXT_ID PWWS0001 for the WSDL Selection Page*/
-  private final String INFOPOP_PWWS_PAGE = ".PWWS0001";
-
-  /*CONTEXT_ID PWWS0002 for the WSDL Document text field of the WSDL Selection Page*/
-  private final String INFOPOP_PWWS_TEXT_WSDL = ".PWWS0002";
-
-  /*CONTEXT_ID PWWS0003 for the WSDL Resource Browse button of the WSDL Selection Page*/
-  private final String INFOPOP_PWWS_BUTTON_BROWSE_WSDL = ".PWWS0003";
-
-  private WebServicesParser webServicesParser;
-  private String webServiceURI;
-  
-  private Composite parent;
-  private Listener statusListener;
-  private TreeViewer treeViewer_;
-  private TreeContentProvider treeContentProvider;
-  private Tree tree_;
-  private int pageWidth_;
-
-  /**
-  * Default constructor.
-  */
-  public WSDLSelectionTreeWidget()
-  {
-    pluginId_ = "org.eclipse.jst.ws.consumption.ui";
-    msgUtils_ = new MessageUtils( pluginId_ + ".plugin", this );
-  }
-
-  public WidgetDataEvents addControls( Composite parent, Listener statusListener )
-  {
-    this.parent = parent;
-  	this.statusListener = statusListener;
-    parent.setToolTipText(msgUtils_.getMessage("TOOLTIP_PWWS_PAGE"));
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, pluginId_ + INFOPOP_PWWS_PAGE);
-
-    Label wsdlLabel = new Label(parent, SWT.WRAP);
-    wsdlLabel.setText(msgUtils_.getMessage("LABEL_SELECT_WSDL"));
-    wsdlLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-
-    tree_ = new Tree(parent, SWT.SINGLE | SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL);
-    GridData gd = new GridData(GridData.FILL_BOTH);
-    gd.heightHint = 200;
-    tree_.setLayoutData(gd);
-    pageWidth_ = tree_.getShell().getSize().x;
-    treeViewer_ = new TreeViewer(tree_);
-    treeContentProvider = new TreeContentProvider();
-    treeViewer_.setContentProvider(treeContentProvider);
-    treeViewer_.setLabelProvider(new TreeLabelProvider());
-    treeViewer_.addSelectionChangedListener(
-      new ISelectionChangedListener()
-      {
-        public void selectionChanged(SelectionChangedEvent event)
-        {
-        	handleTreeSelectionChangedEvent(event);
-        }
-      }
-    );
-    return this;
-  }
-  
-  private void handleTreeSelectionChangedEvent(SelectionChangedEvent event)
-  {
-  	statusListener.handleEvent(new Event());
-  }
-  
-  /**
-   * @return Returns the webServicesParser.
-   */
-  public WebServicesParser getWebServicesParser()
-  {
-  	return webServicesParser;
-  }
-  /**
-   * @param webServicesParser The webServicesParser to set.
-   */
-  public void setWebServicesParser(WebServicesParser webServicesParser)
-  {
-  	this.webServicesParser = webServicesParser;
-  	treeViewer_.setInput(this.webServicesParser);
-  	refreshTreeViewer();
-  }
-
-  public void setWebServiceURI(String wsURI)
-  {
-  	webServiceURI = wsURI;
-  	treeContentProvider.setWebServiceURI(webServiceURI);
-    refreshTreeViewer();
-  }
-
-  public void refreshTreeViewer()
-  {
-  	if (webServicesParser != null && webServiceURI != null)
-  	{
-  	  treeViewer_.refresh();
-  	  Control shell = tree_.getShell();
-  	  if (tree_.getSize().x > pageWidth_ || shell.getSize().x > pageWidth_)
-  	  {
-  	    tree_.setSize(pageWidth_, tree_.getSize().y);
-  	    shell.setSize(pageWidth_, shell.getSize().y);
-  	    shell.computeSize(SWT.DEFAULT, SWT.DEFAULT);
-  	    shell.redraw();
-  	  }
-  	}
-  }
-  
-  public void setEnabled(boolean enabled)
-  {
-    tree_.setEnabled(enabled);
-  }
-  
-  public boolean isEnabled()
-  {
-    return tree_.isEnabled();
-  }
-  
-  public String getWsdlURI()
-  {
-  	WebServiceEntity entity = getSelectionAsWebServiceEntity();
-  	if (entity != null)
-  	  return entity.getURI();
-  	else
-  	  return webServiceURI;
-  }
-  
-  private WebServiceEntity getSelectionAsWebServiceEntity()
-  {
-  	if (treeViewer_ != null)
-  	{
-      ISelection sel = treeViewer_.getSelection();
-      if (!sel.isEmpty() && (sel instanceof IStructuredSelection))
-      {
-        IStructuredSelection ssel = (IStructuredSelection)sel;
-        Object object = ssel.getFirstElement();
-        if (object instanceof WebServiceEntity)
-          return (WebServiceEntity)object;
-      }
-  	}
-    return null;
-  }
-
-  public Status getStatus()
-  {
-    WebServiceEntity wsEntity = getSelectionAsWebServiceEntity();
-    if (wsEntity == null || wsEntity.getType() != WebServiceEntity.TYPE_WSDL)
-      return new SimpleStatus("", msgUtils_.getMessage("PAGE_MSG_SELECTION_MUST_BE_WSDL"), Status.ERROR);
-    else
-      return new SimpleStatus("");
-  }
-
-  private class TreeContentProvider implements ITreeContentProvider
-  {
-  	private String webServiceURI;
-
-    public void dispose()
-    {
-    }
-
-    public void inputChanged(Viewer viewer, Object oldInput, Object newInput)
-    {
-    }
-
-    public Object[] getElements(Object inputElement)
-    {
-      if (inputElement instanceof WebServicesParser)
-      {
-      	WebServicesParser parser = (WebServicesParser)inputElement;
-        Object wsEntity = parser.getWebServiceEntityByURI(webServiceURI);
-        if (wsEntity != null)
-          return new Object[] {wsEntity};
-      }
-      return new Object[0];
-    }
-
-    public Object[] getChildren(Object parentElement)
-    {
-      if (parentElement instanceof WebServiceEntity)
-      {
-        List list = ((WebServiceEntity)parentElement).getChildren();
-        Object[] objects = new Object[list.size()];
-        for (int i = 0; i < objects.length; i++)
-          objects[i] = list.get(i);
-        return objects;
-      }
-      return new Object[0];
-    }
-
-    public Object getParent(Object element)
-    {
-      if (element instanceof WebServiceEntity)
-        return ((WebServiceEntity)element).getParent();
-      return new Object[0];
-    }
-
-    public boolean hasChildren(Object element)
-    {
-      return (getChildren(element).length > 0);
-    }
-    
-    public void setWebServiceURI(String wsURI)
-    {
-      webServiceURI = wsURI;
-    }
-  }
-
-  private class TreeLabelProvider implements ILabelProvider
-  {
-    public Image getImage(Object element)
-    {
-      switch (((WebServiceEntity)element).getType())
-      {
-        case WebServiceEntity.TYPE_HTML:
-          return WebServiceConsumptionUIPlugin.getImageDescriptor("icons/wsil/html.gif").createImage();
-        case WebServiceEntity.TYPE_WSIL:
-          return WebServiceConsumptionUIPlugin.getImageDescriptor("icons/wsil/wsil.gif").createImage();
-        case WebServiceEntity.TYPE_WSDL:
-          return WebServiceConsumptionUIPlugin.getImageDescriptor("icons/wsil/wsdl.gif").createImage();
-        default:
-          return null;
-      }
-    }
-
-    public String getText(Object element)
-    {
-      return ((WebServiceEntity)element).getURI();
-    }
-
-    public void addListener(ILabelProviderListener listener)
-    {
-    }
-
-    public void removeListener(ILabelProviderListener listener)
-    {
-    }
-
-    public boolean isLabelProperty(Object element, String property)
-    {
-      return true;
-    }
-
-    public void dispose()
-    {
-    }
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionWidgetDefaultingCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionWidgetDefaultingCommand.java
deleted file mode 100644
index 069a727..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionWidgetDefaultingCommand.java
+++ /dev/null
@@ -1,114 +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.consumption.ui.widgets;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.ws.internal.common.J2EEActionAdapterFactory;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.wsdl.internal.impl.ServiceImpl;
-import org.eclipse.wst.wsdl.util.WSDLResourceImpl;
-
-public class WSDLSelectionWidgetDefaultingCommand extends SimpleCommand
-{
-  private IStructuredSelection selection_;
-  
-  public String getWebServiceURI()
-  {
-  	if (selection_ != null && !selection_.isEmpty())
-  	{
-  	  Object firstSel = selection_.getFirstElement();
-  	  if (firstSel instanceof IFile)
-  	  {
-  	    IFile ifile = (IFile)firstSel;
-  	    String ext = ifile.getFileExtension();
-  	    if (ext != null && (ext.equals("wsdl") || ext.equals("wsil") || ext.equals("html")))
-  	    {
-  	      return ifile.getFullPath().toString();
-  	    }
-  	  }
-  	  if (firstSel instanceof ServiceImpl)
-      {
-        ServiceImpl serviceImpl = (ServiceImpl)firstSel;
-        return J2EEActionAdapterFactory.getWSDLURI(serviceImpl);
-      }
-  	  if (firstSel instanceof ServiceRef)
-      {
-  	    ServiceRef serviceRef = (ServiceRef)firstSel;
-        return J2EEActionAdapterFactory.getWSDLURI(serviceRef);
-      }
-  	  if (firstSel instanceof WSDLResourceImpl)
-  	  {
-  	    WSDLResourceImpl wsdlRI = (WSDLResourceImpl)firstSel;
-  	    return J2EEActionAdapterFactory.getWSDLURI(wsdlRI);
-  	  }
-  	  if (firstSel instanceof String)
-  	    return (String)firstSel;
-  	}
-    return "";
-  }
- 
-  public void setInitialSelection( IStructuredSelection selection )
-  {
-    selection_ = selection;   
-  }
-  
-  public boolean getGenWSIL()
-  {
-    return false;
-  }
-  
-  public String getWsilURI()
-  {
-  	String wsURI = getWebServiceURI();
-  	if (wsURI != null && wsURI.length() > 0 && wsURI.endsWith("wsdl"))
-  	{
-      StringBuffer sb = new StringBuffer(wsURI.substring(0, wsURI.length()-4));
-      sb.append("wsil");
-      return sb.toString();
-  	}
-    return "";
-  }
-  
-  public IProject getProject()
-  {
-  	IProject p = getProjectFromInitialSelection(selection_);
-  	return p;
-  }
-  
-  private IProject getProjectFromInitialSelection(IStructuredSelection selection)
-  {
-    if (selection != null && selection.size() == 1)
-    {
-      Object obj = selection.getFirstElement();
-      if (obj != null) 
-      {
-        try
-        { 
-          IResource resource = ResourceUtils.getResourceFromSelection(obj);
-          if (resource==null) 
-            return null;
-          IProject p = ResourceUtils.getProjectOf(resource.getFullPath());
-          return p;
-        } catch(CoreException e)
-        {
-          return null;
-        }        
-      }
-    }
-    return null;
-  }  
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionWidgetWrapper.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionWidgetWrapper.java
deleted file mode 100644
index 2a08dc0..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionWidgetWrapper.java
+++ /dev/null
@@ -1,119 +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.consumption.ui.widgets;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.WSDLSelectionWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.WSDLSelectionWrapper;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.command.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.ws.parser.wsil.WebServicesParser;
-
-public class WSDLSelectionWidgetWrapper extends SimpleWidgetDataContributor
-{
-  private String pluginId;
-  private MessageUtils msgUtils;
-
-  private Composite parent;
-  private Listener statusListener;
-  
-  private WSDLSelectionWidget wsdlSelectionWidget;
-  private String webServiceURI;
-  private IProject project;
-  
-  public WSDLSelectionWidgetWrapper()
-  {
-    pluginId = "org.eclipse.jst.ws.consumption.ui";
-    msgUtils = new MessageUtils(pluginId + ".plugin", this);
-  }
-  
-  public WidgetDataEvents addControls(Composite parent, Listener statusListener)
-  {
-    this.parent = parent;
-    this.statusListener = statusListener;
-    wsdlSelectionWidget = new WSDLSelectionWidget();
-    wsdlSelectionWidget.addControls(parent, statusListener);
-    return this;
-  }
-  
-  public Status getStatus()
-  {
-    return wsdlSelectionWidget.getStatus();
-  }
-  
-  public void setWebServiceURI(String wsUri)
-  {
-    IStructuredSelection sel;
-    if (wsUri != null)
-      sel = new StructuredSelection(wsUri);
-    else
-      sel = new StructuredSelection();
-    wsdlSelectionWidget.setInitialSelection(sel);
-  }
-  
-  public String getWebServiceURI()
-  {
-    IStructuredSelection sel    = wsdlSelectionWidget.getObjectSelection();
-    Object               object = sel.getFirstElement();
-    String               result = null;
-    
-    if (object != null )
-    {
-      if( object instanceof WSDLSelectionWrapper )
-      {    
-        // Get at the inner structured selection object.
-        WSDLSelectionWrapper wrapper        = (WSDLSelectionWrapper)object;
-        IStructuredSelection innerSelection = wrapper.wsdlSelection;
-        Object               innerObject    = innerSelection.getFirstElement();
-        
-        result = innerObject == null ? null : innerObject.toString();
-      }
-      else
-      {
-        result = object.toString();
-      }
-    }
-    
-    return result;
-  }
-  
-  public String getWsdlURI()
-  {
-  	return getWebServiceURI();
-  }
-  
-  public WebServicesParser getWebServicesParser()
-  {
-    return wsdlSelectionWidget.getWebServicesParser();
-  }
-  
-  public void setProject(IProject project)
-  {
-  	this.project = project;
-  }
-  
-  public IProject getProject()
-  {
-  	IProject p = wsdlSelectionWidget.getProject();
-  	if (p==null)
-  	{
-  	  return project;
-  	}
-  	else
-  	  return p;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WebServiceClientTypeWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WebServiceClientTypeWidget.java
deleted file mode 100644
index c0043eb..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WebServiceClientTypeWidget.java
+++ /dev/null
@@ -1,115 +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.consumption.ui.widgets;
-
-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.jst.ws.internal.wsrt.WebServiceRuntimeExtensionUtils;
-import org.eclipse.swt.SWT;
-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.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.env.ui.widgets.WidgetDataEvents;
-
-
-public class WebServiceClientTypeWidget extends SimpleWidgetDataContributor
-{     
-  /*CONTEXT_ID PWPR0013 for the Wizard Scenario Client group of the Project Page*/
-  private String INFOPOP_PWPR_GROUP_SCENARIO_CLIENT = "PWPR0013";
-  
-  /*CONTEXT_ID PWPR0014 for the Web Service Client Type combo box of the Project Page*/
-  private String INFOPOP_PWPR_COMBO_CLIENTTYPE = "PWPR0014";
-  private Combo  clientTypeCombo_;
-    
-  /*CONTEXT_ID PWPR0006 for the Test Proxy check box of the Project Page*/
-  private String INFOPOP_PWPR_CHECKBOX_TEST_PROXY = "PWPR0006";
-  private Button testProxyCheckbox_;
-  
-  private TypeRuntimeServer ids_;
-  private LabelsAndIds      labelIds_;
-    
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.WidgetContributor#addControls(org.eclipse.swt.widgets.Composite, org.eclipse.swt.widgets.Listener)
-   */
-  public WidgetDataEvents addControls( Composite parent, Listener statusListener)
-  {
-    String       pluginId = "org.eclipse.jst.ws.consumption.ui";
-    MessageUtils msgUtils = new MessageUtils( pluginId + ".plugin", this );
-    UIUtils      utils    = new UIUtils( msgUtils, pluginId );
-  	
-    Group clientGroup = utils.createGroup( parent, 
-                                           "GROUP_SCENARIO_CLIENT",
-                                           "TOOLTIP_PWPR_GROUP_SCENARIO_CLIENT", 
-                                           INFOPOP_PWPR_GROUP_SCENARIO_CLIENT,
-										   2, 10, 10 );
-                                             
-    
-    int comboStyle = SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY;
-    clientTypeCombo_ = utils.createCombo( clientGroup, 
-                                          "LABEL_WEBSERVICECLIENTTYPE",
-                                          "TOOLTIP_PWPR_COMBO_CLIENTTYPE", 
-                                          INFOPOP_PWPR_COMBO_CLIENTTYPE, 
-                                          comboStyle );
-                                            
-    
-    
-    return this;
-  }
-  
-  public void enableWidget( boolean enable )
-  {
-    clientTypeCombo_.setEnabled( enable );
-  }
-
-  public void setTypeRuntimeServer( TypeRuntimeServer ids )
-  {
-		// rskreg
-    //WebServiceClientTypeRegistry registry   = WebServiceClientTypeRegistry.getInstance();
-    //LabelsAndIds                 labelIds   = registry.getClientTypeLabels();
-		LabelsAndIds                 labelIds   = WebServiceRuntimeExtensionUtils.getClientTypeLabels();
-    int                          selection  = 0;
-    String[]                     clientIds  = labelIds.getIds_();
-    String                       selectedId = ids.getTypeId();
-    
-		// rskreg
-    clientTypeCombo_.setItems( labelIds.getLabels_() );
-    
-    // Now find the selected one.
-    for( int index = 0; index < clientIds.length; index++ )
-    {
-      if( selectedId.equals( clientIds[index ]) )
-      {
-        selection = index;
-        break;
-      }
-    }
-    
-    clientTypeCombo_.select( selection );
-    ids_      = ids;  
-    labelIds_ = labelIds;
-  }
-  
-  public TypeRuntimeServer getTypeRuntimeServer()
-  {
-    int selectionIndex = clientTypeCombo_.getSelectionIndex();
-    
-    ids_.setTypeId( labelIds_.getIds_()[selectionIndex] );
-    
-    return ids_;  
-  }
-      
-  
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ClientWidgetBinding.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ClientWidgetBinding.java
deleted file mode 100644
index dffdb00..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ClientWidgetBinding.java
+++ /dev/null
@@ -1,394 +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.consumption.ui.widgets.binding;
-
-import org.eclipse.jst.ws.internal.common.StringToIProjectTransformer;
-import org.eclipse.jst.ws.internal.consumption.command.common.ClientServerDeployableConfigCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.CreateClientProjectCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.GetMonitorCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.command.CheckForServiceProjectCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.command.data.EclipseIPath2URLStringTransformer;
-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.ClientWizardWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ClientWizardWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ClientWizardWidgetOutputCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.WSDLSelectionOutputCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.WSDLSelectionWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.WSDLSelectionWidgetWrapper;
-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.object.ObjectSelectionOutputCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.runtime.ClientRuntimeSelectionWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.runtime.ClientRuntimeSelectionWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.AddModuleDependenciesCommand;
-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.FinishJavaTestFragment;
-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.WebServiceClientTestArrivalCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.wizard.WebServiceClientTypeRegistry;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.command.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.env.core.fragment.CommandFragmentFactory;
-import org.eclipse.wst.command.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.env.ui.widgets.SelectionCommand;
-import org.eclipse.wst.command.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.env.ui.widgets.WidgetContributorFactory;
-import org.eclipse.wst.command.env.ui.widgets.WidgetRegistry;
-import org.eclipse.wst.ws.internal.extensions.DevelopClientFragment;
-
-
-public class ClientWidgetBinding implements CommandWidgetBinding
-{
-  private CanFinishRegistry   canFinishRegistry_;
-  private WidgetRegistry      widgetRegistry_;
-  private DataMappingRegistry dataMappingRegistry_;
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#create()
-   */
-  public CommandFragmentFactory create()
-  {
-    return new CommandFragmentFactory()
-           {
-             public CommandFragment create()
-             {
-               return new ClientRootCommandFragment();  
-             }
-           };
-  }
-
-  /* (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;
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.env.core.data.DataMappingRegistry)
-   */
-  public void registerDataMappings(DataMappingRegistry dataRegistry)
-  {
-    dataMappingRegistry_ = dataRegistry;
-    
-    // Before ClientWizardWidget
-    dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ClientWizardWidget.class);
-    dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "TestService", ClientWizardWidget.class );
-    dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "MonitorService", ClientWizardWidget.class);
-    dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "ResourceContext", ClientWizardWidget.class );
-    
-    // After ClientWizardWidget
-    dataRegistry.addMapping(ClientWizardWidget.class, "ClientTypeRuntimeServer", ClientWizardWidgetOutputCommand.class);
-    dataRegistry.addMapping(ClientWizardWidget.class, "TestService", ClientWizardWidgetOutputCommand.class);
-    dataRegistry.addMapping(ClientWizardWidget.class, "MonitorService", ClientWizardWidgetOutputCommand.class);
-    dataRegistry.addMapping(ClientWizardWidget.class, "ResourceContext", ClientWizardWidgetOutputCommand.class);
-            
-    // Before ClientRuntimeSelectionWidget
-    dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ClientRuntimeSelectionWidget.class);
-    dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientJ2EEVersion", ClientRuntimeSelectionWidget.class, "J2EEVersion", null);
-    dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "Runtime2ClientTypes", ClientRuntimeSelectionWidget.class);
-    dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientNeedEAR", ClientRuntimeSelectionWidget.class,"NeedEAR",null);
-    
-    // After ClientRuntimeSelectionWidget
-    dataRegistry.addMapping(ClientRuntimeSelectionWidget.class, "ClientTypeRuntimeServer", ClientExtensionDefaultingCommand.class);
-    dataRegistry.addMapping(ClientRuntimeSelectionWidget.class, "J2EEVersion", ClientExtensionDefaultingCommand.class, "ClientJ2EEVersion", null);
-    dataRegistry.addMapping(ClientRuntimeSelectionWidget.class, "Runtime2ClientTypes", ClientExtensionDefaultingCommand.class);
-    dataRegistry.addMapping(ClientRuntimeSelectionWidget.class, "ClientNeedEAR", ClientExtensionDefaultingCommand.class);
-    
-    // The ClientRuntimeSelectionWidget can control what client extension comes up.
-    dataRegistry.addMapping(ClientRuntimeSelectionWidget.class, "ClientTypeRuntimeServer", ClientExtensionFragment.class);
-    
-    // Before WSDLSelectionWidgetWrapper
-    dataRegistry.addMapping(WSDLSelectionWidgetDefaultingCommand.class, "WebServiceURI", WSDLSelectionWidgetWrapper.class );
-    dataRegistry.addMapping(WSDLSelectionWidgetDefaultingCommand.class, "Project", WSDLSelectionWidgetWrapper.class );
-    
-    // After WSDLSelectionWidgetWrapper
-    dataRegistry.addMapping(WSDLSelectionWidgetWrapper.class, "WsdlURI", WSDLSelectionOutputCommand.class);
-    dataRegistry.addMapping(WSDLSelectionWidgetWrapper.class, "WebServicesParser", WSDLSelectionOutputCommand.class);
-    dataRegistry.addMapping(WSDLSelectionWidgetWrapper.class, "Project", WSDLSelectionOutputCommand.class);
-        
-    // Before Client Test widget.
-    dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "TestService",FinishTestFragment.class);
-    dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "TestService", ClientTestWidget.class );
-    dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ClientTestWidget.class );
-    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 the client test widget   
-    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, "SampleMethods",ClientTestDelegateCommand.class);
-    
-    dataRegistry.addMapping(ClientTestWidget.class, "TestService",FinishTestFragment.class);
-    dataRegistry.addMapping(ClientTestWidget.class, "TestID",FinishTestFragment.class);
-    dataRegistry.addMapping(ClientTestWidget.class, "IsTestWidget",FinishTestFragment.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;
-    
-    widgetRegistry.add( "ClientWizardWidget", 
-                        msgUtils.getMessage("PAGE_TITLE_WS_PROJECT"),
-                        msgUtils.getMessage("PAGE_DESC_WS_PROJECT"),
-				        new WidgetContributorFactory()
-				        {
-				          public WidgetContributor create()
-				          {
-				            return new ClientWizardWidget();
-				          }
-				        } );
-    
-    widgetRegistry.add( "ClientRuntimeSelectionWidget", 
-                        msgUtils.getMessage("PAGE_TITLE_WS_CLIENT_RUNTIME_SELECTION"),
-                        msgUtils.getMessage("PAGE_DESC_WS_CLIENT_RUNTIME_SELECTION"),
-						new WidgetContributorFactory()
-                        {
-						  public WidgetContributor create()
-						  {
-						    return new ClientRuntimeSelectionWidget();
-						  }
-						} );
-    
-    widgetRegistry.add( "WSDLSelectionWidgetWrapper", 
-                        msgUtils.getMessage("PAGE_TITLE_WS_SELECTION"),
-                        msgUtils.getMessage("PAGE_DESC_WS_SELECTION"),
-		                new WidgetContributorFactory()
-                        {
-		                  public WidgetContributor create()
-		                  {
-		                    return new WSDLSelectionWidgetWrapper();
-		                  }
-		                } );
-    
-    widgetRegistry.add( "ClientTestWidget", 
-                        msgUtils.getMessage("PAGE_TITLE_WS_SAMPLE"),
-                        msgUtils.getMessage("PAGE_DESC_WS_SAMPLE"),
-                        new WidgetContributorFactory()
-                        {
-                          public WidgetContributor create()
-                          {
-                            return new ClientTestWidget(); 
-                          }
-                        });
-  }
-
-  private class InitClientRegistry extends SimpleCommand
-  {  
-    private WebServiceClientTypeRegistry clientRegistry_ = WebServiceClientTypeRegistry.getInstance();
-    
-    /* (non-Javadoc)
-     * @see org.eclipse.wst.command.env.core.Command#execute(org.eclipse.wst.command.env.core.common.Environment)
-     */
-    public Status execute(Environment environment) 
-    {
-      clientRegistry_.setDataMappingRegistry( dataMappingRegistry_ );
-      clientRegistry_.setWidgetRegistry( widgetRegistry_ );
-      clientRegistry_.setCanFinishRegistry( canFinishRegistry_ );
-      
-      return new SimpleStatus( "" );
-    }
-  }
-  
-  private class ClientRootCommandFragment extends SequenceFragment
-  {
-    public ClientRootCommandFragment()
-    {
-      //add( new SimpleFragment( new CheckForMissingFiles(), "" ) );
-      add( new SimpleFragment( new ClientWizardWidgetDefaultingCommand(), "" ) );
-      add( new SimpleFragment( new InitClientRegistry(), "" ));
-      add( new SimpleFragment( "ClientWizardWidget" ) );
-	  //add( new TestCommandFactoryFragment() );
-      add( new SimpleFragment( new ClientWizardWidgetOutputCommand(), "" ));
-      add( new SimpleFragment( new WSDLSelectionWidgetDefaultingCommand(), ""));
-      add( new SimpleFragment( "WSDLSelectionWidgetWrapper" ) );
-      add( new SimpleFragment( new WSDLSelectionOutputCommand(), ""));
-      add( new SimpleFragment( new ClientRuntimeSelectionWidgetDefaultingCommand(), ""));
-	  //add( new TestCommandFactoryFragment2() );
-      add( new SimpleFragment( "ClientRuntimeSelectionWidget" ) );
-      //add( new SimpleFragment( new CheckForServiceProjectCommand(), ""));
-      add( new SimpleFragment( new ClientExtensionDefaultingCommand( true ), ""));
-      //add(new SimpleFragment(new ClientServerDeployableConfigCommand(false), "")); //Note: added here for client      
-      //add( new SimpleFragment( new CreateClientProjectCommand(), ""));  
-      //add( new ClientExtensionFragment() );
-	  add( new ClientRootFragment() );
-      add( new SimpleFragment( new ClientExtensionOutputCommand(), "" ) );
-      add( new SimpleFragment(new GetMonitorCommand(), ""));
-      add( new SimpleFragment(new TestDefaultingFragment(),""));
-      add( new ClientTestFragment( "ClientTestWidget") ); 
-      add(new FinishFragment());
-    }
-    
-    /* (non-Javadoc)
-     * @see org.eclipse.wst.command.env.core.fragment.CommandFragment#registerDataMappings(org.eclipse.wst.command.env.core.data.DataMappingRegistry)
-     */
-    public void registerDataMappings(DataMappingRegistry dataRegistry)
-    {
-      //Map SelectionCommand
-      dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ClientRuntimeSelectionWidgetDefaultingCommand.class, "InitialInitialSelection", null);
-      
-      // Map ClientWizardWidgetDefaultingCommand command.
-      dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ClientWizardWidgetOutputCommand.class);
-      dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "TestService", ClientWizardWidgetOutputCommand.class);
-      dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "MonitorService", ClientWizardWidgetOutputCommand.class);
-      dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "ResourceContext", ClientWizardWidgetOutputCommand.class);
-      
-      // Map ClientWizardWidgetOutputCommand command.
-      dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "ClientTypeRuntimeServer", ClientRuntimeSelectionWidgetDefaultingCommand.class);
-      dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "TestService", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "ResourceContext", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "MonitorService", GetMonitorCommand.class);
-      
-      // Map ClientRuntimeSelectionWidgetDefaultingCommand command
-      dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ClientExtensionDefaultingCommand.class); 
-      dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "Runtime2ClientTypes", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientJ2EEVersion", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientNeedEAR", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "Runtime2ClientTypes", CheckForServiceProjectCommand.class);
-      
-      // Map WSDLSelectionWidgetDefaultingCommand command.
-      dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", WSDLSelectionWidgetDefaultingCommand.class );
-      dataRegistry.addMapping(WSDLSelectionWidgetDefaultingCommand.class, "GenWSIL", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(WSDLSelectionWidgetDefaultingCommand.class, "WsilURI", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(WSDLSelectionWidgetDefaultingCommand.class, "WebServiceURI", WSDLSelectionOutputCommand.class, "WsdlURI", new EclipseIPath2URLStringTransformer());
-      dataRegistry.addMapping(WSDLSelectionWidgetDefaultingCommand.class, "Project", WSDLSelectionOutputCommand.class);
-      
-      // WSDLSelectionOutputCommand
-      dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "WsdlURI", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "WebServicesParser", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "WsdlURI", GetMonitorCommand.class);
-      dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "WebServicesParser", GetMonitorCommand.class);
-      dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "Project", ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientInitialProject", null);
-      dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "WsdlURI", ClientRuntimeSelectionWidgetDefaultingCommand.class);
-      dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "WebServicesParser", ClientRuntimeSelectionWidgetDefaultingCommand.class);
-      dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "WsdlURI", CheckForServiceProjectCommand.class);
-      dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "WebServicesParser", CheckForServiceProjectCommand.class);      
-      
-      //ServerDeployableConfigurationCommand for client 
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProject", ClientServerDeployableConfigCommand.class, "SampleProject", new StringToIProjectTransformer());
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", ClientServerDeployableConfigCommand.class, "ClientTypeRuntimeServer", null);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientServerInstance", ClientServerDeployableConfigCommand.class,"SampleExistingServer", new ServerInstToIServerTransformer());
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientServer", ClientServerDeployableConfigCommand.class,"SampleServerTypeID", null);
-	  
-	  // Setup the PreClientDevelopCommand.
-			//
-      dataRegistry.addMapping( ClientWizardWidgetOutputCommand.class, "TestService", PreClientDevelopCommand.class);           
-      dataRegistry.addMapping( ClientWizardWidgetOutputCommand.class, "ResourceContext", PreClientDevelopCommand.class);						
-			//
-	    dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", 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( ClientWizardWidgetOutputCommand.class, "ResourceContext", PreClientDevelopCommand.class);
-	    dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "WsdlURI", PreClientDevelopCommand.class );
-      
-			dataRegistry.addMapping( PreClientDevelopCommand.class, "WebService", ClientExtensionOutputCommand.class, "WebServiceClient", null );
-			
-      // Map ClientExtensionDefaultingCommand command.
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", ClientExtensionFragment.class);
-      
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProject", CreateClientProjectCommand.class, "ProxyProject", new StringToIProjectTransformer());
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProjectEAR", CreateClientProjectCommand.class, "ProxyProjectEAR", new StringToIProjectTransformer());
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProjectType", CreateClientProjectCommand.class, "ClientProjectTypeId", null);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientServer", CreateClientProjectCommand.class, "ServerFactoryId", null);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientJ2EEVersion", CreateClientProjectCommand.class, "J2EEVersion", null);      
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientNeedEAR", CreateClientProjectCommand.class, "NeedEAR", null);
-      
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProject", WebServiceClientTestArrivalCommand.class);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProjectEAR", WebServiceClientTestArrivalCommand.class);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "Runtime2ClientTypes", WebServiceClientTestArrivalCommand.class);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", WebServiceClientTestArrivalCommand.class, "ClientIds", null);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientJ2EEVersion", WebServiceClientTestArrivalCommand.class, "J2eeVersion", null);
-      
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "GenerateProxy", ClientTestFragment.class);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "TestService", ClientTestFragment.class );     
-      
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProject",ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", FinishDefaultCommand.class);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientServer", ClientTestDelegateCommand.class);
-      
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProject", AddModuleDependenciesCommand.class );
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientJ2EEVersion", AddModuleDependenciesCommand.class);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "WsdlURI", ClientTestDelegateCommand.class);
-      
-      // Map ClientExtensionOutputCommand command.
-      dataRegistry.addMapping(ClientExtensionOutputCommand.class, "ProxyBean", WebServiceClientTestArrivalCommand.class);      
-      dataRegistry.addMapping(ClientExtensionOutputCommand.class, "GenerateProxy", ClientTestFragment.class);
-      dataRegistry.addMapping(ClientExtensionOutputCommand.class, "GenerateProxy", FinishTestFragment.class);
-      dataRegistry.addMapping(ClientExtensionOutputCommand.class, "GenerateProxy", ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(ClientExtensionOutputCommand.class, "GenerateProxy", FinishJavaTestFragment.class);
-      dataRegistry.addMapping(ClientExtensionOutputCommand.class, "SetEndpointMethod", ClientTestDelegateCommand.class);
-      
-      // GetMonitorCommand
-      dataRegistry.addMapping(GetMonitorCommand.class, "Endpoints", ClientTestDelegateCommand.class);
-
-      // MAP post server config call      
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProjectEAR", ClientExtensionOutputCommand.class, "EarProjectName", null);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientServerInstance", ClientExtensionOutputCommand.class, "ExistingServerId", null);
-      dataRegistry.addMapping(ClientServerDeployableConfigCommand.class, "SampleExistingServerInstId", ClientExtensionOutputCommand.class, "ExistingServerId", null);
-                  
-      
-      // Map ClientServerDeployableConfigCommand
-      dataRegistry.addMapping(ClientServerDeployableConfigCommand.class, "SampleExistingServerInstId", CreateClientProjectCommand.class, "ExistingServerId", null);
-      dataRegistry.addMapping(ClientServerDeployableConfigCommand.class, "AddedProjectToServer", CreateClientProjectCommand.class);
-      dataRegistry.addMapping(ClientServerDeployableConfigCommand.class, "SampleExistingServerInstId", FinishDefaultCommand.class, "ExistingServerId", null);
-      
-      // Map WebServiceClientTestArrivalCommand command.
-      dataRegistry.addMapping(TestDefaultingFragment.class, "TestFacility",ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "ProxyBean",ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(WebServiceClientTestArrivalCommand.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);
-      
-      dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "SampleProject",AddModuleDependenciesCommand.class);
-      dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "SampleProjectEAR",AddModuleDependenciesCommand.class);
-    }
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ConfigClientHandlersWidgetBinding.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ConfigClientHandlersWidgetBinding.java
deleted file mode 100644
index 9eca864..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ConfigClientHandlersWidgetBinding.java
+++ /dev/null
@@ -1,144 +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.consumption.ui.widgets.binding;
-
-import org.eclipse.jst.ws.internal.consumption.ui.command.GenerateHandlerSkeletonCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.command.OpenJavaEditorCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ClientHandlersWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ClientHandlersWidgetOutputCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ConfigClientHandlersTableWidget;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.env.core.fragment.CommandFragmentFactory;
-import org.eclipse.wst.command.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.env.ui.widgets.SelectionCommand;
-import org.eclipse.wst.command.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.env.ui.widgets.WidgetContributorFactory;
-import org.eclipse.wst.command.env.ui.widgets.WidgetRegistry;
-
-
-/**
- * 
- * Handler Configuration Window - Preferences - Java - Code Generation - Code
- * and Comments
- */
-public class ConfigClientHandlersWidgetBinding implements CommandWidgetBinding {
-  
-  private CanFinishRegistry   canFinishRegistry_;
-  private WidgetRegistry      widgetRegistry_;
-  private DataMappingRegistry dataMappingRegistry_;
-  /*
-   * (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;
-    
-    widgetRegistry.add("ConfigClientHandlersTableWidget", 
-        msgUtils.getMessage("PAGE_TITLE_CLIENT_HDLR_CONFIG"), 
-        msgUtils.getMessage("PAGE_DESC_CLIENT_HDLR_CONFIG"), 
-        new WidgetContributorFactory() {
-
-      	public WidgetContributor create() {
-      	  return new ConfigClientHandlersTableWidget();
-      	}
-    });
-
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.env.core.data.DataMappingRegistry)
-   */
-  public void registerDataMappings(DataMappingRegistry dataRegistry) {
-    dataMappingRegistry_ = dataRegistry;
-    
-    
-//    dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class,"AllHandlers", ConfigClientHandlersTableWidget.class);
-    dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class,"Handlers", ConfigClientHandlersTableWidget.class,"WsRefsToHandlers", null);
-    
-    dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class,"GenSkeletonEnabled", ConfigClientHandlersTableWidget.class);
-    dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class,"SourceOutputLocation", ConfigClientHandlersTableWidget.class);
-    dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class,"ServiceRefName", ConfigClientHandlersTableWidget.class);
-    dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class,"RefNameToServiceRef", ConfigClientHandlersTableWidget.class);
-    
-    //dataRegistry.addMapping(ConfigClientHandlersTableWidget.class,"AllHandlersList", ClientHandlersWidgetOutputCommand.class);
-    dataRegistry.addMapping(ConfigClientHandlersTableWidget.class,"WsRefsToHandlers", ClientHandlersWidgetOutputCommand.class,"HandlersTable",null);
-    
-    dataRegistry.addMapping(ConfigClientHandlersTableWidget.class,"SourceOutputLocation", GenerateHandlerSkeletonCommand.class,"OutputLocation",null);
-    dataRegistry.addMapping(ConfigClientHandlersTableWidget.class,"HandlerClassNames", GenerateHandlerSkeletonCommand.class,"HandlerNames",null);
-    dataRegistry.addMapping(ConfigClientHandlersTableWidget.class,"GenSkeletonEnabled", GenerateHandlerSkeletonCommand.class);
-
-    dataRegistry.addMapping(GenerateHandlerSkeletonCommand.class,"Project", OpenJavaEditorCommand.class);
-    dataRegistry.addMapping(GenerateHandlerSkeletonCommand.class,"ClassNames", OpenJavaEditorCommand.class);
-    
-  }
-
-  /*
-   * (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;
-
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.eclipse.wst.command.env.core.fragment.CommandFragmentFactoryFactory#create()
-   */
-  public CommandFragmentFactory create() {
-    return new CommandFragmentFactory() {
-
-      public CommandFragment create() {
-
-        return new ClientHandlersConfigCommandFragment();
-      }
-    };
-  }
-
-  private class ClientHandlersConfigCommandFragment extends SequenceFragment{
-   
-    public ClientHandlersConfigCommandFragment()
-    {
-      add( new SimpleFragment( new ClientHandlersWidgetDefaultingCommand(), "" ));
-      add( new SimpleFragment( "ConfigClientHandlersTableWidget" ) );
-      add( new SimpleFragment( new ClientHandlersWidgetOutputCommand(), "" ));
-      add( new SimpleFragment( new GenerateHandlerSkeletonCommand(), ""));
-      add( new SimpleFragment( new OpenJavaEditorCommand(), ""));
-    }
-    
-    /* (non-Javadoc)
-     * @see org.eclipse.wst.command.env.core.fragment.CommandFragment#registerDataMappings(org.eclipse.wst.command.env.core.data.DataMappingRegistry)
-     */
-    public void registerDataMappings(DataMappingRegistry dataRegistry)
-    {
-      dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ClientHandlersWidgetDefaultingCommand.class);
-      
-      dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class,"WsClientResource", ClientHandlersWidgetOutputCommand.class);
-      dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class,"WsServiceRefs", ClientHandlersWidgetOutputCommand.class);      
-      dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class,"ClientProject", ClientHandlersWidgetOutputCommand.class);
-    }
- 
-  }
-  
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ConfigServiceHandlersWidgetBinding.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ConfigServiceHandlersWidgetBinding.java
deleted file mode 100644
index 0167bb5..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ConfigServiceHandlersWidgetBinding.java
+++ /dev/null
@@ -1,145 +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.consumption.ui.widgets.binding;
-
-import org.eclipse.jst.ws.internal.consumption.ui.command.GenerateHandlerSkeletonCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.command.OpenJavaEditorCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ConfigServiceHandlersTableWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ServiceHandlersWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ServiceHandlersWidgetOutputCommand;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.env.core.fragment.CommandFragmentFactory;
-import org.eclipse.wst.command.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.env.ui.widgets.SelectionCommand;
-import org.eclipse.wst.command.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.env.ui.widgets.WidgetContributorFactory;
-import org.eclipse.wst.command.env.ui.widgets.WidgetRegistry;
-
-
-/**
- * 
- * Handler Configuration Window - Preferences - Java - Code Generation - Code
- * and Comments
- */
-public class ConfigServiceHandlersWidgetBinding implements CommandWidgetBinding {
-  
-  private CanFinishRegistry   canFinishRegistry_;
-  private WidgetRegistry      widgetRegistry_;
-  private DataMappingRegistry dataMappingRegistry_;
-  /*
-   * (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;
-    
-    widgetRegistry.add("ConfigServiceHandlersTableWidget", 
-        msgUtils.getMessage("PAGE_TITLE_SERVICE_HDLR_CONFIG"), 
-        msgUtils.getMessage("PAGE_DESC_SERVICE_HDLR_CONFIG"), 
-        new WidgetContributorFactory() {
-
-      	public WidgetContributor create() {
-      	  return new ConfigServiceHandlersTableWidget();
-      	}
-    });
-
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.env.core.data.DataMappingRegistry)
-   */
-  public void registerDataMappings(DataMappingRegistry dataRegistry) {
-    dataMappingRegistry_ = dataRegistry;
-    
-    dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class,"WsRefsToHandlers", ConfigServiceHandlersTableWidget.class);
-    dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class,"GenSkeletonEnabled", ConfigServiceHandlersTableWidget.class);
-    dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class,"SourceOutputLocation", ConfigServiceHandlersTableWidget.class);
-    dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class,"ServiceDescNameToDescObj", ConfigServiceHandlersTableWidget.class);
-    
-    dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class,"DescriptionName", ConfigServiceHandlersTableWidget.class);
-    
-    
-    dataRegistry.addMapping(ConfigServiceHandlersTableWidget.class,"HandlersList", ServiceHandlersWidgetOutputCommand.class);
-    dataRegistry.addMapping(ConfigServiceHandlersTableWidget.class,"WsDescToHandlers", ServiceHandlersWidgetOutputCommand.class);
-    dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class,"ServiceDescNameToDescObj", ServiceHandlersWidgetOutputCommand.class);
-    
-    dataRegistry.addMapping(ConfigServiceHandlersTableWidget.class,"SourceOutputLocation", GenerateHandlerSkeletonCommand.class,"OutputLocation",null);
-    dataRegistry.addMapping(ConfigServiceHandlersTableWidget.class,"HandlerClassNames", GenerateHandlerSkeletonCommand.class,"HandlerNames",null);
-    dataRegistry.addMapping(ConfigServiceHandlersTableWidget.class,"GenSkeletonEnabled", GenerateHandlerSkeletonCommand.class);
- 
-    dataRegistry.addMapping(GenerateHandlerSkeletonCommand.class,"Project", OpenJavaEditorCommand.class);
-    dataRegistry.addMapping(GenerateHandlerSkeletonCommand.class,"ClassNames", OpenJavaEditorCommand.class);
-   
-  }
-
-  /*
-   * (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;
-
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.eclipse.wst.command.env.core.fragment.CommandFragmentFactoryFactory#create()
-   */
-  public CommandFragmentFactory create() {
-    return new CommandFragmentFactory() {
-
-      public CommandFragment create() {
-
-        return new ServiceHandlersConfigCommandFragment();
-      }
-    };
-  }
-
-  private class ServiceHandlersConfigCommandFragment extends SequenceFragment{
-   
-    public ServiceHandlersConfigCommandFragment()
-    {
-      add( new SimpleFragment( new ServiceHandlersWidgetDefaultingCommand(), "" ));
-      add( new SimpleFragment( "ConfigServiceHandlersTableWidget" ) );
-      add( new SimpleFragment( new ServiceHandlersWidgetOutputCommand(), "" ));
-      add( new SimpleFragment( new GenerateHandlerSkeletonCommand(), ""));
-      add( new SimpleFragment( new OpenJavaEditorCommand(), ""));
-
-    }
-    
-    /* (non-Javadoc)
-     * @see org.eclipse.wst.command.env.core.fragment.CommandFragment#registerDataMappings(org.eclipse.wst.command.env.core.data.DataMappingRegistry)
-     */
-    public void registerDataMappings(DataMappingRegistry dataRegistry)
-    {
-      dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ServiceHandlersWidgetDefaultingCommand.class);
-      
-      dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class, "WsddResource", ServiceHandlersWidgetOutputCommand.class);
-      
-      
-    }
- 
-  }
-  
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ConfigureHandlersWidgetBinding.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ConfigureHandlersWidgetBinding.java
deleted file mode 100644
index 8ef9270..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ConfigureHandlersWidgetBinding.java
+++ /dev/null
@@ -1,253 +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.consumption.ui.widgets.binding;
-
-import org.eclipse.jst.ws.internal.consumption.ui.command.GenerateHandlerSkeletonCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ClientHandlersWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ClientHandlersWidgetOutputCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ConfigClientHandlersTableWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ConfigServiceHandlersTableWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.HandlersDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ServiceHandlersWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ServiceHandlersWidgetOutputCommand;
-import org.eclipse.wst.command.env.core.common.Condition;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.env.core.fragment.BooleanFragment;
-import org.eclipse.wst.command.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.env.core.fragment.CommandFragmentFactory;
-import org.eclipse.wst.command.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.env.ui.widgets.SelectionCommand;
-import org.eclipse.wst.command.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.env.ui.widgets.WidgetContributorFactory;
-import org.eclipse.wst.command.env.ui.widgets.WidgetRegistry;
-
-
-public class ConfigureHandlersWidgetBinding implements CommandWidgetBinding {
-
-  private CanFinishRegistry canFinishRegistry_;
-
-  private WidgetRegistry widgetRegistry_;
-
-  private DataMappingRegistry dataMappingRegistry_;
-
-  public ConfigureHandlersWidgetBinding() {
-
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#create()
-   */
-  public CommandFragmentFactory create() {
-    return new CommandFragmentFactory() {
-
-      public CommandFragment create() {
-        return new HandlersCommandFragment();
-      }
-    };
-  }
-
-  /*
-   * (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;
-  }
-
-  /*
-   * (non-Javadoc),
-   * 
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.env.core.data.DataMappingRegistry)
-   */
-  public void registerDataMappings(DataMappingRegistry dataRegistry) {
-    dataMappingRegistry_ = dataRegistry;
-
-    // Map client-side widgets to commands
-    dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class, "Handlers", ConfigClientHandlersTableWidget.class, "WsRefsToHandlers", null);
-
-    dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class, "GenSkeletonEnabled", ConfigClientHandlersTableWidget.class);
-    dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class, "SourceOutputLocation", ConfigClientHandlersTableWidget.class);
-    dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class, "ServiceRefName", ConfigClientHandlersTableWidget.class);
-    dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class, "RefNameToServiceRef", ConfigClientHandlersTableWidget.class);
-
-    dataRegistry.addMapping(ConfigClientHandlersTableWidget.class, "WsRefsToHandlers", ClientHandlersWidgetOutputCommand.class, "HandlersTable", null);
-
-    dataRegistry.addMapping(ConfigClientHandlersTableWidget.class, "SourceOutputLocation", GenerateHandlerSkeletonCommand.class, "OutputLocation", null);
-    dataRegistry.addMapping(ConfigClientHandlersTableWidget.class, "HandlerClassNames", GenerateHandlerSkeletonCommand.class, "HandlerNames", null);
-    dataRegistry.addMapping(ConfigClientHandlersTableWidget.class, "GenSkeletonEnabled", GenerateHandlerSkeletonCommand.class);
-
-    // Map service-side widgets to commands
-    dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class, "WsRefsToHandlers", ConfigServiceHandlersTableWidget.class);
-    dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class, "GenSkeletonEnabled", ConfigServiceHandlersTableWidget.class);
-    dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class, "SourceOutputLocation", ConfigServiceHandlersTableWidget.class);
-    dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class, "ServiceDescNameToDescObj", ConfigServiceHandlersTableWidget.class);
-
-    dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class, "DescriptionName", ConfigServiceHandlersTableWidget.class);
-
-    dataRegistry.addMapping(ConfigServiceHandlersTableWidget.class, "HandlersList", ServiceHandlersWidgetOutputCommand.class);
-    dataRegistry.addMapping(ConfigServiceHandlersTableWidget.class, "WsDescToHandlers", ServiceHandlersWidgetOutputCommand.class);
-    dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class, "ServiceDescNameToDescObj", ServiceHandlersWidgetOutputCommand.class);
-
-    dataRegistry.addMapping(ConfigServiceHandlersTableWidget.class, "SourceOutputLocation", GenerateHandlerSkeletonCommand.class, "OutputLocation", null);
-    dataRegistry.addMapping(ConfigServiceHandlersTableWidget.class, "HandlerClassNames", GenerateHandlerSkeletonCommand.class, "HandlerNames", null);
-    dataRegistry.addMapping(ConfigServiceHandlersTableWidget.class, "GenSkeletonEnabled", GenerateHandlerSkeletonCommand.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.add("ConfigServiceHandlersTableWidget", msgUtils.getMessage("PAGE_TITLE_SERVICE_HDLR_CONFIG"), msgUtils
-        .getMessage("PAGE_DESC_SERVICE_HDLR_CONFIG"), new WidgetContributorFactory() {
-
-      public WidgetContributor create() {
-        return new ConfigServiceHandlersTableWidget();
-      }
-    });
-
-    widgetRegistry.add("ConfigClientHandlersTableWidget", msgUtils.getMessage("PAGE_TITLE_CLIENT_HDLR_CONFIG"), msgUtils
-        .getMessage("PAGE_DESC_CLIENT_HDLR_CONFIG"), new WidgetContributorFactory() {
-
-      public WidgetContributor create() {
-        return new ConfigClientHandlersTableWidget();
-      }
-    });
-
-  }
-
-  private class HandlersCommandFragment extends SequenceFragment {
-
-    public HandlersCommandFragment() {
-
-      add(new SimpleFragment(new HandlersDefaultingCommand(), ""));
-
-      add(new ServiceHandlersFragment());
-      add(new ClientHandlersFragment());
-    }
-
-    public void registerDataMappings(DataMappingRegistry dataRegistry) {
-
-      dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", HandlersDefaultingCommand.class);
-
-      dataRegistry.addMapping(HandlersDefaultingCommand.class, "IsClientHandler", ClientHandlersFragment.class, "ClientHandlersEnabled", null);
-      dataRegistry.addMapping(HandlersDefaultingCommand.class, "IsServiceHandler", ServiceHandlersFragment.class, "ServiceHandlersEnabled", null);
-
-      dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class,"WsClientResource", ClientHandlersWidgetOutputCommand.class);
-      dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class,"WsServiceRefs", ClientHandlersWidgetOutputCommand.class);      
-      dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class,"ClientProject", ClientHandlersWidgetOutputCommand.class);
-     
-      dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class, "WsddResource", ServiceHandlersWidgetOutputCommand.class);
-
-    }
-
-    public void registerCanFinish(CanFinishRegistry canFinishRegistry) {
-      canFinishRegistry_ = canFinishRegistry;
-    }
-  }
-
-  private class ClientHandlersFragment extends BooleanFragment {
-
-    boolean isClient_ = false;
-
-    public ClientHandlersFragment() {
-      setCondition(new Condition() {
-
-        public boolean evaluate() {
-          return isClient_;
-        }
-      });
-
-      SequenceFragment clientHandlersRootFragment = new SequenceFragment();
-
-      clientHandlersRootFragment.add(new SimpleFragment(new ClientHandlersWidgetDefaultingCommand(), ""));
-
-      clientHandlersRootFragment.add(new SimpleFragment("ConfigClientHandlersTableWidget"));
-      clientHandlersRootFragment.add(new SimpleFragment(new ClientHandlersWidgetOutputCommand(), ""));
-      clientHandlersRootFragment.add(new SimpleFragment(new GenerateHandlerSkeletonCommand(), ""));
-
-      setTrueFragment(clientHandlersRootFragment);
-    }
-
-    public void setClientHandlersEnabled(boolean isClient) {
-      isClient_ = isClient;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.wst.command.env.core.fragment.CommandFragment#registerDataMappings(org.eclipse.wst.command.env.core.data.DataMappingRegistry)
-     */
-    public void registerDataMappings(DataMappingRegistry dataRegistry) {
-      dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ClientHandlersWidgetDefaultingCommand.class);
-
-      dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class, "WsClientResource", ClientHandlersWidgetOutputCommand.class);
-      dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class, "ClientProject", ClientHandlersWidgetOutputCommand.class);
-
-    }
-
-  }
-
-  private class ServiceHandlersFragment extends BooleanFragment {
-
-    boolean isService_ = false;
-
-    public ServiceHandlersFragment() {
-      setCondition(new Condition() {
-
-        public boolean evaluate() {
-          return isService_;
-        }
-      });
-
-      SequenceFragment serviceHandlersRootFragment = new SequenceFragment();
-      serviceHandlersRootFragment.add(new SimpleFragment(new ServiceHandlersWidgetDefaultingCommand(), ""));
-
-      SequenceFragment serviceHandlersFragment = new SequenceFragment();
-      serviceHandlersFragment.add(new SimpleFragment("ConfigServiceHandlersTableWidget"));
-      serviceHandlersFragment.add(new SimpleFragment(new ServiceHandlersWidgetOutputCommand(), ""));
-      serviceHandlersFragment.add(new SimpleFragment(new GenerateHandlerSkeletonCommand(), ""));
-
-      serviceHandlersRootFragment.add(serviceHandlersFragment);
-
-      setTrueFragment(serviceHandlersRootFragment);
-    }
-
-    public void setServiceHandlersEnabled(boolean isService) {
-      isService_ = isService;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.wst.command.env.core.fragment.CommandFragment#registerDataMappings(org.eclipse.wst.command.env.core.data.DataMappingRegistry)
-     */
-    public void registerDataMappings(DataMappingRegistry dataRegistry) {
-      dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ServiceHandlersWidgetDefaultingCommand.class);
-
-      dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class, "WsddResource", ServiceHandlersWidgetOutputCommand.class);
-
-    }
-
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/GenSampleWidgetBinding.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/GenSampleWidgetBinding.java
deleted file mode 100644
index 820545b..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/GenSampleWidgetBinding.java
+++ /dev/null
@@ -1,306 +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.consumption.ui.widgets.binding;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.common.StringToIProjectTransformer;
-import org.eclipse.jst.ws.internal.consumption.ui.command.data.EclipseIPath2URLStringTransformer;
-import org.eclipse.jst.ws.internal.consumption.ui.common.FinishFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ClientWizardWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ClientWizardWidgetOutputCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.WSDLSelectionWidgetDefaultingCommand;
-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.runtime.ClientRuntimeSelectionWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.AddModuleDependenciesCommand;
-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.FinishJavaTestFragment;
-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.WebServiceClientTestArrivalCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.wizard.WebServiceClientTypeRegistry;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.command.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.env.core.data.Transformer;
-import org.eclipse.wst.command.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.env.core.fragment.CommandFragmentFactory;
-import org.eclipse.wst.command.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.env.ui.widgets.SelectionCommand;
-import org.eclipse.wst.command.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.env.ui.widgets.WidgetContributorFactory;
-import org.eclipse.wst.command.env.ui.widgets.WidgetRegistry;
-
-
-public class GenSampleWidgetBinding implements CommandWidgetBinding
-{
-  private CanFinishRegistry   canFinishRegistry_;
-  private WidgetRegistry      widgetRegistry_;
-  private DataMappingRegistry dataMappingRegistry_;
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#create()
-   */
-  public CommandFragmentFactory create()
-  {
-    return new CommandFragmentFactory()
-           {
-             public CommandFragment create()
-             {
-               return new GenSampleRootCommandFragment();  
-             }
-           };
-  }
-
-  /* (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;
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.env.core.data.DataMappingRegistry)
-   */
-  public void registerDataMappings(DataMappingRegistry dataRegistry)
-  {
-    dataMappingRegistry_ = dataRegistry;
-                    
-    // Before Client Test widget.
-    dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "TestService",FinishTestFragment.class);
-    dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "TestService", ClientTestWidget.class );
-    dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ClientTestWidget.class );
-    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 the client test widget   
-    dataRegistry.addMapping(ClientTestWidget.class, "SampleProjectEAR",ClientTestDelegateCommand.class);
-    dataRegistry.addMapping(ClientTestWidget.class, "SampleProject",ClientTestDelegateCommand.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, "SampleMethods",ClientTestDelegateCommand.class);
-    
-    dataRegistry.addMapping(ClientTestWidget.class, "TestService",FinishTestFragment.class);
-    dataRegistry.addMapping(ClientTestWidget.class, "TestID",FinishTestFragment.class);
-    dataRegistry.addMapping(ClientTestWidget.class, "IsTestWidget",FinishTestFragment.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;
-        
-    widgetRegistry.add( "ClientTestWidget", 
-                        msgUtils.getMessage("PAGE_TITLE_WS_SAMPLE"),
-                        msgUtils.getMessage("PAGE_DESC_WS_SAMPLE"),
-                        new WidgetContributorFactory()
-                        {
-                          public WidgetContributor create()
-                          {
-                            return new ClientTestWidget(); 
-                          }
-                        });
-  }
-
-  private class InitClientRegistry extends SimpleCommand
-  {  
-    private WebServiceClientTypeRegistry clientRegistry_ = WebServiceClientTypeRegistry.getInstance();
-    
-    /* (non-Javadoc)
-     * @see org.eclipse.wst.command.env.core.Command#execute(org.eclipse.wst.command.env.core.common.Environment)
-     */
-    public Status execute(Environment environment) 
-    {
-      clientRegistry_.setDataMappingRegistry( dataMappingRegistry_ );
-      clientRegistry_.setWidgetRegistry( widgetRegistry_ );
-      clientRegistry_.setCanFinishRegistry( canFinishRegistry_ );
-      
-      return new SimpleStatus( "" );
-    }
-  }
-  
-  private class InitializeProxyCommand extends SimpleCommand
-  {
-    private IStructuredSelection selection_;
-    
-    public String getProxyBean()
-    {
-      String proxyBean = "";
-      
-      try
-      {
-        IResource resource    = ResourceUtils.getResourceFromSelection( selection_.getFirstElement() );
-        String    beanPackage = ResourceUtils.getJavaResourcePackageName( resource.getFullPath() );
-        
-        if( beanPackage==null )
-          beanPackage = "";
-        else
-          beanPackage = beanPackage + ".";
-
-        proxyBean = beanPackage + resource.getName();
-
-        if( proxyBean.toLowerCase().endsWith(".java") || proxyBean.toLowerCase().endsWith(".class")) 
-        {
-          proxyBean = proxyBean.substring(0,proxyBean.lastIndexOf('.'));
-        }
-      }
-      catch( CoreException exc )
-      {        
-      }
-      
-      return proxyBean;
-    }
-    
-    public boolean getGenerateProxy()
-    {
-      return true;
-    }
-    
-    public void setInitialSelection( IStructuredSelection selection )
-    {
-      selection_ = selection;  
-    }
-  }
-  
-  private class GenSampleRootCommandFragment extends SequenceFragment
-  {
-    public GenSampleRootCommandFragment()
-    {
-      add( new SimpleFragment( new ClientWizardWidgetDefaultingCommand(), "" ) );
-      add( new SimpleFragment( new InitClientRegistry(), "" ));
-      add( new SimpleFragment( new ClientWizardWidgetOutputCommand(), "" ));
-      add( new SimpleFragment( new WSDLSelectionWidgetDefaultingCommand(), ""));
-      add( new SimpleFragment( new ClientRuntimeSelectionWidgetDefaultingCommand(), ""));
-      add( new SimpleFragment( new ClientExtensionDefaultingCommand( true ), ""));
-      add( new SimpleFragment( new InitializeProxyCommand(), "" ));
-      add( new SimpleFragment( new ClientExtensionOutputCommand(), "" ) );
-      add( new SimpleFragment( new TestDefaultingFragment(),""));
-      add( new ClientTestFragment( "ClientTestWidget") ); 
-      add( new FinishFragment() );
-    }
-    
-    /* (non-Javadoc)
-     * @see org.eclipse.wst.command.env.core.fragment.CommandFragment#registerDataMappings(org.eclipse.wst.command.env.core.data.DataMappingRegistry)
-     */
-    public void registerDataMappings(DataMappingRegistry dataRegistry)
-    {
-      //Map SelectionCommand
-      dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientInitialSelection", null);
-      dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", InitializeProxyCommand.class );
-      
-      // Map ClientWizardWidgetDefaultingCommand command.
-      dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ClientWizardWidgetOutputCommand.class);
-      dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "TestService", ClientWizardWidgetOutputCommand.class, "TestService", new ForceTrue() );
-      dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "ResourceContext", ClientWizardWidgetOutputCommand.class);
-      
-      // Map ClientWizardWidgetOutputCommand command.
-      dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "ClientTypeRuntimeServer", ClientRuntimeSelectionWidgetDefaultingCommand.class);
-      dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "TestService", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "ResourceContext", ClientExtensionDefaultingCommand.class);
-      
-      // Map ClientRuntimeSelectionWidgetDefaultingCommand command
-      dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ClientExtensionDefaultingCommand.class); 
-      dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "Runtime2ClientTypes", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientJ2EEVersion", ClientExtensionDefaultingCommand.class);
-      
-      // Map WSDLSelectionWidgetDefaultingCommand command.
-      dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", WSDLSelectionWidgetDefaultingCommand.class );
-      dataRegistry.addMapping(WSDLSelectionWidgetDefaultingCommand.class, "GenWSIL", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(WSDLSelectionWidgetDefaultingCommand.class, "WsilURI", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(WSDLSelectionWidgetDefaultingCommand.class, "WebServiceURI", ClientExtensionDefaultingCommand.class, "WsdlURI", new EclipseIPath2URLStringTransformer());
-             
-      // Map ClientExtensionDefaultingCommand command.
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", ClientExtensionFragment.class);
-           
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProject", WebServiceClientTestArrivalCommand.class);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProjectEAR", WebServiceClientTestArrivalCommand.class);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "Runtime2ClientTypes", WebServiceClientTestArrivalCommand.class);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", WebServiceClientTestArrivalCommand.class, "ClientIds", null);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientJ2EEVersion", WebServiceClientTestArrivalCommand.class, "J2eeVersion", null);      
-      
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "GenerateProxy", ClientTestFragment.class);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "TestService", ClientTestFragment.class );     
-      
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProject",ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", FinishDefaultCommand.class);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientServer", ClientTestDelegateCommand.class);
-      
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProject", AddModuleDependenciesCommand.class );
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientJ2EEVersion", AddModuleDependenciesCommand.class);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "WsdlURI", ClientTestDelegateCommand.class);
-      
-      // Map InitializeProxyCommand command.
-      dataRegistry.addMapping(InitializeProxyCommand.class, "ProxyBean", ClientExtensionOutputCommand.class);      
-      dataRegistry.addMapping(InitializeProxyCommand.class, "GenerateProxy", ClientExtensionOutputCommand.class);
-      
-      // Map ClientExtensionOutputCommand command.
-      dataRegistry.addMapping(ClientExtensionOutputCommand.class, "ProxyBean", WebServiceClientTestArrivalCommand.class);      
-      dataRegistry.addMapping(ClientExtensionOutputCommand.class, "GenerateProxy", ClientTestFragment.class);
-      dataRegistry.addMapping(ClientExtensionOutputCommand.class, "GenerateProxy", FinishTestFragment.class);
-      dataRegistry.addMapping(ClientExtensionOutputCommand.class, "GenerateProxy", ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(ClientExtensionOutputCommand.class, "GenerateProxy", FinishJavaTestFragment.class);
-      
-      // MAP post server config call      
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProjectEAR", ClientExtensionOutputCommand.class, "EARProjectName", new StringToIProjectTransformer());
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientServerInstance", ClientExtensionOutputCommand.class, "ExistingServerId", null);
-            
-      
-      // Map WebServiceClientTestArrivalCommand command.
-      dataRegistry.addMapping(TestDefaultingFragment.class, "TestFacility",ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "ProxyBean",ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(WebServiceClientTestArrivalCommand.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);
-      
-      dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "SampleProject",AddModuleDependenciesCommand.class);
-      dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "SampleProjectEAR",AddModuleDependenciesCommand.class);
-    }
-  }
-  
-  private class ForceTrue implements Transformer
-  {
-    public Object transform(Object value) 
-    {
-      return new Boolean(true);
-    }
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ImportWSILWidgetBinding.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ImportWSILWidgetBinding.java
deleted file mode 100644
index 3854afa..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ImportWSILWidgetBinding.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.consumption.ui.widgets.binding;
-
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ImportWSILWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.wsil.AddWSDLToWSILWrapperCommand;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.env.core.fragment.CommandFragmentFactory;
-import org.eclipse.wst.command.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.env.ui.widgets.SelectionCommand;
-import org.eclipse.wst.command.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.env.ui.widgets.WidgetContributorFactory;
-import org.eclipse.wst.command.env.ui.widgets.WidgetRegistry;
-
-
-public class ImportWSILWidgetBinding implements CommandWidgetBinding
-{
-  private CanFinishRegistry   canFinishRegistry;
-  private WidgetRegistry      widgetRegistry;
-  private DataMappingRegistry dataMappingRegistry;
-
-  public ImportWSILWidgetBinding()
-  {
-  }
-  /* (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("ImportWSILWidget"));
-               root.add(new SimpleFragment(new AddWSDLToWSILWrapperCommand(), ""));
-               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;
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.env.core.data.DataMappingRegistry)
-   */
-  public void registerDataMappings(DataMappingRegistry dataRegistry)
-  {
-    this.dataMappingRegistry = dataRegistry;
-    
-    // ImportWSILWidget
-    dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ImportWSILWidget.class);
-    
-    // AddWSDLToWSILWrapperCommand
-    dataRegistry.addMapping(ImportWSILWidget.class, "GenWSILArguments", AddWSDLToWSILWrapperCommand.class, "Args", null);
-  }
-
-  /* (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;
-
-    widgetRegistry.add("ImportWSILWidget", 
-      msgUtils.getMessage("TITLE_WSIL_IMPORT"),
-      msgUtils.getMessage("DESC_WSIL_IMPORT"),
-      new WidgetContributorFactory()
-      {
-        public WidgetContributor create()
-        {
-          return new ImportWSILWidget();
-        }
-      }
-    );
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ImportWSWidgetBinding.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ImportWSWidgetBinding.java
deleted file mode 100644
index 0299218..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ImportWSWidgetBinding.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.consumption.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.jst.ws.internal.explorer.WSExplorerLauncherCommand;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.env.core.fragment.CommandFragmentFactory;
-import org.eclipse.wst.command.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.env.ui.widgets.WidgetContributorFactory;
-import org.eclipse.wst.command.env.ui.widgets.WidgetRegistry;
-
-
-public class ImportWSWidgetBinding implements CommandWidgetBinding
-{
-  private CanFinishRegistry   canFinishRegistry;
-  private WidgetRegistry      widgetRegistry;
-  private DataMappingRegistry dataMappingRegistry;
-  private PublishToPrivateUDDICommandFragment publishToPrivateUDDICmdFrag;
-
-  public ImportWSWidgetBinding()
-  {
-    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("WSImport"));
-               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.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("WSImport", 
-      msgUtils.getMessage("PAGE_TITLE_WS_FIND"),
-      msgUtils.getMessage("PAGE_DESC_WS_FIND"),
-      new WidgetContributorFactory()
-      {
-        public WidgetContributor create()
-        {
-          return new PublishWSWidget(false);
-        }
-      }
-    );
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ClientExtensionDefaultingCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ClientExtensionDefaultingCommand.java
deleted file mode 100644
index 6c875f8..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ClientExtensionDefaultingCommand.java
+++ /dev/null
@@ -1,314 +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.consumption.ui.widgets.extensions;
-
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.context.ResourceContext;
-import org.eclipse.wst.command.env.core.selection.SelectionListChoices;
-import org.eclipse.wst.ws.parser.discovery.WebServicesParserExt;
-import org.eclipse.wst.ws.parser.wsil.WebServicesParser;
-
-
-public class ClientExtensionDefaultingCommand extends SimpleCommand
-{
-  // ClientWizardWidget
-  private TypeRuntimeServer    clientIds_;
-  private Boolean              testService;
-  private ResourceContext      resourceContext;
-  
-  // ClientRuntimeSelectionWidget
-  private SelectionListChoices clientChoices_;
-  private String j2eeVersion;
-  private boolean clientNeedEAR_;
-  
-  // WSDLSelectionWidget
-  private boolean           genWSIL;
-  private String            wsilURI;
-  
-  // WSDLSelectionConditionCommand
-  private WebServicesParser webServicesParser;
-  
-  // WSDLSelectionTreeWidget
-  private String            wsdlURI;
-  
-  private boolean           isClientScenario_;
-  private boolean           genProxy_ = true;
-  private String launchedServiceTestName;
-  
-  //ServerDeployableConfigurationCommand
-  private String serverInstId_;
-  
-  public ClientExtensionDefaultingCommand( boolean isClientScenario )
-  {
-    isClientScenario_ = isClientScenario;
-  }
-
-  /**
-   * 
-   * @return returns true if this command is running in the client wizard and
-   * false if this command is running in the create web service wizard.
-   */
-  public boolean getIsClientScenario()
-  {
-    return isClientScenario_; 
-  }
-  
-  public void setRuntime2ClientTypes( SelectionListChoices choices )
-  {
-    clientChoices_ = choices;  
-  }
-  
-  public SelectionListChoices getRuntime2ClientTypes()
-  {
-    return clientChoices_;  
-  }
-  
-  public void setClientTypeRuntimeServer(TypeRuntimeServer ids)
-  {
-    clientIds_ = ids;
-  }
-  
-  public TypeRuntimeServer getClientTypeRuntimeServer()
-  {
-    return clientIds_;
-  }
-  
-  public void setServiceExistingServerInstId(String serverInstId) {
-  	this.serverInstId_ = serverInstId;
-  }
-  
-  public String getServiceExistingServerInstId(){
-  	return this.serverInstId_;
-  }
-  
-  /**
-   * @return Returns the clientIsExistingServer.
-   */
-  public boolean isClientIsExistingServer()
-  {
-    return clientIds_.getServerInstanceId() != null;
-  }
-
-  /**
-   * @return Returns the clientProject.
-   */
-  public String getClientProject()
-  {
-    return clientChoices_.getChoice().getChoice().getList().getSelection();
-  }
-
-  /**
-   * @return Returns the clientProjectEAR.
-   */
-  public String getClientProjectEAR()
-  {
-    return clientChoices_.getChoice().getChoice().getChoice().getList().getSelection();
-  }
-
-  /**
-   * @return Returns the clientProjectType.
-   */
-  public String getClientProjectType()
-  {
-    return clientChoices_.getChoice().getList().getSelection();
-  }
-
-  /**
-   * @return Returns the clientRuntime.
-   */
-  public String getClientRuntime()
-  {
-    return clientIds_.getRuntimeId();
-  }
-
-  /**
-   * @return Returns the clientServer.
-   */
-  public String getClientServer()
-  {
-    return clientIds_.getServerId();
-  }
-  
-  public String getClientServerInstance()
-  {
-    return clientIds_.getServerInstanceId();    
-  }
-
-  public void setClientExistingServerInstanceId(String serverInstId){
-    
-    if (clientIds_.getServerInstanceId()==null)
-      clientIds_.setServerInstanceId(serverInstId);
-  }
-  
-  /**
-   * @return Returns the genWSIL.
-   */
-  public boolean isGenWSIL()
-  {
-    return genWSIL;
-  }
-
-  /**
-   * @param genWSIL
-   *            The genWSIL to set.
-   */
-  public void setGenWSIL(boolean genWSIL)
-  {
-    this.genWSIL = genWSIL;
-  }
-
-  /**
-   * @return Returns the resourceContext.
-   */
-  public ResourceContext getResourceContext()
-  {
-    return resourceContext;
-  }
-
-  /**
-   * @param resourceContext
-   *            The resourceContext to set.
-   */
-  public void setResourceContext(ResourceContext resourceContext)
-  {
-    this.resourceContext = resourceContext;
-  }
-
-  /**
-   * @return Returns the testProxySelected.
-   */
-  public Boolean getTestService()
-  {
-    return testService;
-  }
-
-  /**
-   * @param testProxySelected
-   *            The testProxySelected to set.
-   */
-  public void setTestService(Boolean testService)
-  {
-    this.testService = testService;
-  }
-
-  /**
-   * @return Returns the wsdlURI.
-   */
-  public String getWsdlURI()
-  {
-    return wsdlURI;
-  }
-
-  /**
-   * @param wsdlURI
-   *            The wsdlURI to set.
-   */
-  public void setWsdlURI(String wsdlURI)
-  {
-    this.wsdlURI = wsdlURI;
-  }
-
-  /**
-   * @return Returns the wsilURI.
-   */
-  public String getWsilURI()
-  {
-    return wsilURI;
-  }
-
-  /**
-   * @param wsilURI
-   *            The wsilURI to set.
-   */
-  public void setWsilURI(String wsilURI)
-  {
-    this.wsilURI = wsilURI;
-  }
-
-  /**
-   * @return Returns the webServicesParser.
-   */
-  public WebServicesParser getWebServicesParser()
-  {
-    if (webServicesParser != null)
-      return webServicesParser;
-    else
-      return new WebServicesParserExt();
-  }
-
-  /**
-   * @param webServicesParser
-   *            The webServicesParser to set.
-   */
-  public void setWebServicesParser(WebServicesParser webServicesParser)
-  {
-    this.webServicesParser = webServicesParser;
-  }
-
-  /**
-   * @return Returns the j2eeVersion.
-   */
-  public String getClientJ2EEVersion()
-  {
-	  return j2eeVersion;
-  }
-
-  /**
-   * @param version The j2eeVersion to set.
-   */
-  public void setClientJ2EEVersion(String version)
-  {
-	  j2eeVersion = version;
-  }
-  
-  /**
-   * 
-   * @return returns true if a proxy should be generated and false otherwise.
-   */
-  public boolean getGenerateProxy()
-  {
-    return genProxy_;
-  }
-  
-  public void setGenerateProxy( boolean genProxy )
-  {
-    genProxy_ = genProxy;
-  }
-
-  public void setLaunchedServiceTestName(String launchedServiceTestName)
-  {
-  	this.launchedServiceTestName = launchedServiceTestName;
-  }
-
-  /**
-   * 
-   * @return returns the name of the test facility to launch.
-   */
-  public String getLaunchedServiceTestName()
-  {
-  	return launchedServiceTestName;
-  }
-  
-  /**
-   * 
-   * @return returns true if the client project needs an EAR project.
-   */
-  public boolean getClientNeedEAR()
-  {
-    return clientNeedEAR_;
-  }
-  
-  public void setClientNeedEAR(boolean clientNeedEAR)
-  {
-    clientNeedEAR_ = clientNeedEAR;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ClientExtensionFragment.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ClientExtensionFragment.java
deleted file mode 100644
index 0576027..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ClientExtensionFragment.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.jst.ws.internal.consumption.ui.widgets.extensions;
-
-import org.eclipse.jst.ws.internal.consumption.ui.wizard.WebServiceClientTypeRegistry;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.wst.command.env.core.fragment.ExtensionFragment;
-
-
-public class ClientExtensionFragment extends ExtensionFragment
-{  
-  public ClientExtensionFragment()
-  {
-    setExtensionRegistry( WebServiceClientTypeRegistry.getInstance() );
-  }
-  
-  protected ClientExtensionFragment( ClientExtensionFragment fragment )
-  {
-    super( fragment );  
-  }
-  
-  public void setClientTypeRuntimeServer( TypeRuntimeServer ids )
-  {
-    setExtensionIds( new String[]{ ids.getTypeId(), ids.getRuntimeId(), ids.getServerId() } );
-  }
-  
-  /* (non-Javadoc)
-   * @see java.lang.Object#clone()
-   */
-  public Object clone() 
-  {
-    return new ClientExtensionFragment( this );
-  }  
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ClientExtensionOutputCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ClientExtensionOutputCommand.java
deleted file mode 100644
index 04b6991..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ClientExtensionOutputCommand.java
+++ /dev/null
@@ -1,193 +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.consumption.ui.widgets.extensions;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.ws.internal.common.EnvironmentUtils;
-import org.eclipse.jst.ws.internal.consumption.command.common.AbstractStartServer;
-import org.eclipse.jst.ws.internal.consumption.common.WebServiceStartServerRegistry;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.IServerWorkingCopy;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceClient;
-
-public class ClientExtensionOutputCommand extends SimpleCommand
-{
-  private String  proxyBean_;
-  private boolean genProxy_;
-  private String setEndpointMethod;
-	private IWebServiceClient webServiceClient_;
-  
-  private String existingServerId_;
-  private String earProjectName_;  
-  private IServer fExistingServer = null;
-  
-  public boolean isUndoable(){
-  	return true;
-  }
-
-  public Status undo(Environment env){
-  	Status stat = new SimpleStatus("");
-
-    try	{
-    	
-      // check existingServer
-      if (fExistingServer!=null) {
-    	
-        // get EAR project
-        IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-        IProject earProject = null;
-        if (earProjectName_!=null && earProjectName_.length()>0) {
-          earProject = root.getProject(earProjectName_);
-    	}    	
-    	
-    	AbstractStartServer startServerCommand = null;
-    	WebServiceStartServerRegistry reg = WebServiceStartServerRegistry.getInstance();
-    	startServerCommand = (AbstractStartServer)reg.getServerStartByTypeId(fExistingServer.getServerType().getId());
-    	if (earProject!=null) {
-    		startServerCommand.runPreServerConfig(fExistingServer, earProject);
-    	}
-      }
-   	}
-    catch (CoreException ce ) {
-      IStatus embeddedStatus = ce.getStatus();
-      stat = EnvironmentUtils.convertIStatusToStatus(embeddedStatus);
-      env.getStatusHandler().reportError(stat);
-  		return stat;
-  	}  	
-  	
-  	return stat;
-  }  
-  
-  public Status execute(Environment env){
-  	
-  	Status status = new SimpleStatus("");  	
-  	
-    IServer[] servers = ServerCore.getServers();
-    IServer existingServer = null;
-    fExistingServer = null; 
-    for (int i=0; i<servers.length; i++)
-    {
-      IServer thisServer = (IServer)servers[i];
-      IServerWorkingCopy wc = null;
-      String thisServerId = null;
-      if (thisServer!=null) {
-      	wc = thisServer.createWorkingCopy();
-        thisServerId = (wc!=null ? wc.getId() : null);
-      }
-      
-      if (thisServerId.equals(existingServerId_))
-        existingServer = thisServer;
-    }    	
-    try	{
-        IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-        IProject earProject = null;
-        if (earProjectName_!=null && earProjectName_.length()>0)
-        {
-          earProject = root.getProject(earProjectName_);
-        }    	
-    	
-        if (existingServer!=null){
-   		  AbstractStartServer startServerCommand = null;
-   		  WebServiceStartServerRegistry reg = WebServiceStartServerRegistry.getInstance();
-     	  startServerCommand = (AbstractStartServer)reg.getServerStartByTypeId(existingServer.getServerType().getId());
-     	  if (earProject!=null){
-     	  	startServerCommand.runPostServerConfig(existingServer, earProject);
-     	  	fExistingServer = existingServer;
-     	  }
-        }
-   	}
-    catch (CoreException ce ) {
-    	IStatus embeddedStatus = ce.getStatus();
-    	status = EnvironmentUtils.convertIStatusToStatus(embeddedStatus);
-    	env.getStatusHandler().reportError(status);
-  		return status;
-  	}
-  	
-  	return status;      	
-  }
-  
-  /**
-   * @return Returns the proxyBean.
-   */
-  
-  public String getProxyBean()
-  {
-    return webServiceClient_.getWebServiceClientInfo().getImplURL();
-  }
-  /**
-   * @param proxyBean The proxyBean to set.
-   */
-	/*
-  public void setProxyBean(String proxyBean)
-  {
-    this.proxyBean_ = proxyBean;
-  }
-  */
-  
-  public boolean getGenerateProxy()
-  {
-    //return genProxy_;
-		return true;
-  }
-  
-	/*
-  public void setGenerateProxy( boolean genProxy )
-  {
-    genProxy_ = genProxy;
-  }
-  */
-  
-  /**
-   * @return Returns the setEndpointMethod.
-   */
-  public String getSetEndpointMethod()
-  {
-    //return setEndpointMethod;
-		return "setEndpoint";
-  }
-  /**
-   * @param setEndpointMethod The setEndpointMethod to set.
-   */
-	/*
-  public void setSetEndpointMethod(String setEndpointMethod)
-  {
-    this.setEndpointMethod = setEndpointMethod;
-  }
-  */
-  /**
-   * @param earProjectName The earProjectName to set.
-   */
-  public void setEarProjectName(String earProjectName) {
-  	this.earProjectName_ = earProjectName;
-  }
-  /**
-   * @param existingServerId The existingServerId to set.
-   */
-  public void setExistingServerId(String existingServerId) {
-  	this.existingServerId_ = existingServerId;
-  }  
-	
-	public void setWebServiceClient(IWebServiceClient wsc)
-	{
-		webServiceClient_ = wsc;
-	}
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ServerExtensionDefaultingCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ServerExtensionDefaultingCommand.java
deleted file mode 100644
index d983fbf..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ServerExtensionDefaultingCommand.java
+++ /dev/null
@@ -1,248 +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.consumption.ui.widgets.extensions;
-
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.jst.ws.internal.wsrt.WebServiceRuntimeExtensionUtils;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.selection.SelectionListChoices;
-import org.eclipse.wst.ws.parser.discovery.WebServicesParserExt;
-import org.eclipse.wst.ws.parser.wsil.WebServicesParser;
-
-
-public class ServerExtensionDefaultingCommand extends SimpleCommand
-{
-  private Boolean              startService;
-  private Boolean              testService;
-  private Boolean              publishService;
-  private TypeRuntimeServer    serviceIds_;
-  private SelectionListChoices serviceChoices_;
-  private String j2eeVersion;
-  private boolean serviceNeedEAR_;
-  private WebServicesParser wsdlParser_;
-
-  
-  public void setServiceTypeRuntimeServer(TypeRuntimeServer ids)
-  {
-    serviceIds_ = ids;
-  }
-
-  public void setServiceExistingServerInstanceId(String serverInstId){
-    
-    if (serviceIds_.getServerInstanceId()==null)
-      serviceIds_.setServerInstanceId(serverInstId);
-  }
-  
-  /**
-   * 
-   * @return returns the TypeRuntimeService object that the user has selected on
-   * page 3 of the wizard.
-   */
-  public TypeRuntimeServer getServiceTypeRuntimeServer()
-  {
-    return serviceIds_;
-  }
-
-  public void setServiceProject2EARProject(SelectionListChoices choices)
-  {
-    serviceChoices_ = choices;
-  }
-
-
-  /**
-   * @return Returns the publishService.
-   */
-  public Boolean getPublishService()
-  {
-    return publishService;
-  }
-
-  /**
-   * @param publishService
-   *            The publishService to set.
-   */
-  public void setPublishService(Boolean publishService)
-  {
-    this.publishService = publishService;
-  }
-
-  /**
-   * @return Returns the serverIsExistingServer.
-   */
-  public boolean getServerIsExistingServer()
-  {
-    return serviceIds_.getServerInstanceId() != null;
-  }
-
-  /**
-
-   * @return Returns the serverInstanceId
-   */
-  public String getServiceServerInstanceId()
-  {
-    return serviceIds_.getServerInstanceId();
-  }
-  
-  /**
-   * @return Returns the serverProject.
-   */
-  public String getServerProject()
-  {
-    return serviceChoices_.getList().getSelection();
-  }
-
-  /**
-   * @return Returns the serverProjectEAR.
-   */
-  public String getServerProjectEAR()
-  {
-    return serviceChoices_.getChoice().getList().getSelection();
-  }
-
-  /**
-   * @return Returns the serverRuntime.
-   */
-  public String getServerRuntime()
-  {
-    return serviceIds_.getRuntimeId();
-  }
-
-  /**
-   * @return Returns the serverServer.
-   */
-  public String getServerServer()
-  {
-    return serviceIds_.getServerId();
-  }
-
-  /**
-   * @return Returns the serviceScenarioId.
-   */
-  public String getServiceScenarioId()
-  {
-    return serviceIds_.getTypeId();
-  }
-
-  /**
-   * @return Returns the startService.
-   */
-  public Boolean getStartService()
-  {
-    return startService;
-  }
-
-  /**
-   * @param startService
-   *            The startService to set.
-   */
-  public void setStartService(Boolean startService)
-  {
-    this.startService = startService;
-  }
-
-  /**
-   * @return Returns the testService.
-   */
-  public Boolean getTestService()
-  {
-    return testService;
-  }
-
-  /**
-   * @param testService
-   *            The testService to set.
-   */
-  public void setTestService(Boolean testService)
-  {
-    this.testService = testService;
-  }
-
-  public Boolean getPublish()
-  {
-    return new Boolean(true);
-  }
-
-  /**
-   * @return Returns the j2eeVersion.
-   */
-  public String getServiceJ2EEVersion()
-  {
-  	return j2eeVersion;
-  }
-  
-  /**
-   * @param version The j2eeVersion to set.
-   */
-  public void setServiceJ2EEVersion(String version)
-  {
-  	j2eeVersion = version;
-  }
-  
-  /**
-   * 
-   * @return returns true if the web service project needs to be in an EAR project.
-   */
-  public boolean getServiceNeedEAR()
-  {
-    return serviceNeedEAR_;
-  }
-  
-  public void setServiceNeedEAR(boolean serviceNeedEAR)
-  {
-    serviceNeedEAR_ = serviceNeedEAR;
-  }  
-  
-  /**
-   * 
-   * @return returns true if the web service project is an EJB project.
-   */
-  public boolean getIsServiceProjectEJB()
-  {
-    //If the type/server/runtime suggests that an EJB project
-    //is required, return true.
-    boolean ejbRequired = false;
-    boolean ejbRequired2 = false;
-	// rskreg
-    //WebServiceServerRuntimeTypeRegistry wssrtRegistry = WebServiceServerRuntimeTypeRegistry.getInstance();
-    if (serviceIds_ != null)
-    {      
-      //String serverTypeId = wssrtRegistry.getWebServiceServerByFactoryId(serviceIds_.getServerId()).getId();
-	  //String serverTypeId = wssrtRegistry.getWebServiceServerByFactoryId(serviceIds_.getServerId()).getId();
-      //ejbRequired = wssrtRegistry.requiresEJBModuleFor(serverTypeId, serviceIds_.getRuntimeId(), serviceIds_.getTypeId());
-	  ejbRequired = WebServiceRuntimeExtensionUtils.requiresEJBModuleFor(serviceIds_.getServerId(), serviceIds_.getRuntimeId(), serviceIds_.getTypeId());
-      //ejbRequired2 = wssrtRegistry.requiresEJBProject(serviceIds_.getTypeId()); 
-	  ejbRequired2 = WebServiceRuntimeExtensionUtils.requiresEJBProject(serviceIds_.getTypeId());
-    }
-
-	// rskreg
-    return (ejbRequired || ejbRequired2);    
-  }
-  
-  /**
-   * @return Returns the wsdlParser_.
-   */
-  public WebServicesParser getWebServicesParser()
-  {
-    if( wsdlParser_ == null )
-    {
-      wsdlParser_ = new WebServicesParserExt();  
-    }
-    
-    return wsdlParser_;
-  }
-  /**
-   * @param wsdlParser_ The wsdlParser_ to set.
-   */
-  public void setWebServicesParser(WebServicesParser wsdlParser )
-  {
-    wsdlParser_ = wsdlParser;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ServerExtensionFragment.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ServerExtensionFragment.java
deleted file mode 100644
index f89cace..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ServerExtensionFragment.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.jst.ws.internal.consumption.ui.widgets.extensions;
-
-import org.eclipse.jst.ws.internal.consumption.ui.wizard.WebServiceServerRuntimeTypeRegistry;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.wst.command.env.core.fragment.ExtensionFragment;
-
-
-public class ServerExtensionFragment extends ExtensionFragment
-{  
-  public ServerExtensionFragment()
-  {
-    setExtensionRegistry( WebServiceServerRuntimeTypeRegistry.getInstance()  );
-  }
-  
-  protected ServerExtensionFragment( ServerExtensionFragment fragment )
-  {
-    super( fragment );  
-  }
-  
-  public void setServiceTypeRuntimeServer( TypeRuntimeServer ids )
-  {
-    setExtensionIds( new String[]{ ids.getTypeId(), ids.getRuntimeId(), ids.getServerId() } );
-  }
-  
-  /* (non-Javadoc)
-   * @see java.lang.Object#clone()
-   */
-  public Object clone() 
-  {
-    return new ServerExtensionFragment( this );
-  }  
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ServerExtensionOutputCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ServerExtensionOutputCommand.java
deleted file mode 100644
index 9583c42..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ServerExtensionOutputCommand.java
+++ /dev/null
@@ -1,203 +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.consumption.ui.widgets.extensions;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.ws.internal.common.EnvironmentUtils;
-import org.eclipse.jst.ws.internal.consumption.command.common.AbstractStartServer;
-import org.eclipse.jst.ws.internal.consumption.common.WebServiceStartServerRegistry;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.IServerWorkingCopy;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebService;
-import org.eclipse.wst.ws.parser.discovery.WebServicesParserExt;
-import org.eclipse.wst.ws.parser.wsil.WebServicesParser;
-
-public class ServerExtensionOutputCommand extends SimpleCommand
-{
-  //private String            wsdlURI_;
-  private WebServicesParser wsdlParser_;
-	private IWebService 			webService_;
-  
-  private String existingServerId_;
-  private String earProjectName_;
-  private boolean isWebProjectStartupRequested_ = false;
-  
-  private IServer fExistingServer = null;
-  
-  public boolean isUndoable(){
-  	return true;
-  }
-
-  public Status undo(Environment env){
-		
-
-  	Status stat = new SimpleStatus("");
-		
-		//Commenting out all extranseous sever startups
-		/*
-    try	{
-    	
-      // check existingServer
-      if (fExistingServer!=null) {
-    	
-        // get EAR project
-        IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-        IProject earProject = null;
-        if (earProjectName_!=null && earProjectName_.length()>0) {
-          earProject = root.getProject(earProjectName_);
-    	}    	
-    	
-    	AbstractStartServer startServerCommand = null;
-    	WebServiceStartServerRegistry reg = WebServiceStartServerRegistry.getInstance();
-    	startServerCommand = (AbstractStartServer)reg.getServerStartByTypeId(fExistingServer.getServerType().getId());
-    	if (earProject!=null) {
-    		startServerCommand.runPreServerConfig(fExistingServer, earProject);
-    	}
-      }
-   	}
-    catch (CoreException ce ) {
-      IStatus embeddedStatus = ce.getStatus();
-      stat = EnvironmentUtils.convertIStatusToStatus(embeddedStatus);
-      env.getStatusHandler().reportError(stat);
-  		return stat;
-  	}  	
-  	*/
-  	return stat;
-  }  
-
-  public Status execute(Environment env){
-  	
-  	Status status = new SimpleStatus("");  	
-  	// Commenting out all extraneous server startups
-		/*
-    IServer[] servers = ServerCore.getServers();
-    IServer existingServer =null;
-    fExistingServer = null; 
-    for (int i=0; i<servers.length; i++)
-    {
-      IServer thisServer = (IServer)servers[i];
-      IServerWorkingCopy wc = null;
-      String thisServerId = null;
-      if (thisServer!=null) {
-      	wc = thisServer.createWorkingCopy();
-        thisServerId = (wc!=null ? wc.getId() : null);
-      }
-      
-      if (thisServerId.equals(existingServerId_))
-        existingServer = thisServer;
-    }    	
-    try	{
-        IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-        IProject earProject = null;
-        if (earProjectName_!=null && earProjectName_.length()>0)
-        {
-          earProject = root.getProject(earProjectName_);
-        }    	
-    	
-   		AbstractStartServer startServerCommand = null;
-   		WebServiceStartServerRegistry reg = WebServiceStartServerRegistry.getInstance();
-     	startServerCommand = (AbstractStartServer)reg.getServerStartByTypeId(existingServer.getServerType().getId());
-     	if (earProject!=null) {
-     		startServerCommand.runPostServerConfig(existingServer, earProject);
-     		fExistingServer = existingServer;
-     	}
-   	}
-    catch (CoreException ce ) {
-    	IStatus embeddedStatus = ce.getStatus();
-    	status = EnvironmentUtils.convertIStatusToStatus(embeddedStatus);
-    	env.getStatusHandler().reportError(status);
-  		return status;
-  	}
-  	*/
-  	return status;      	
-  }
-  
-  
-  /**
-   * @return Returns the wsdlURI.
-   */
-  public String getWsdlURI()
-  {
-    return webService_.getWebServiceInfo().getWsdlURL();
-  }
-
-  /**
-   * @param wsdlURI
-   *            The wsdlURI to set.
-   */
-	/*
-  public void setWsdlURI(String wsdlURI)
-  {
-    wsdlURI_ = wsdlURI;
-  }
-  */
-	
-	public void setWebService(IWebService ws)
-	{
-		webService_ = ws;
-	}
-	
-  /**
-   * @return Returns the wsdlParser_.
-   */
-  public WebServicesParser getWebServicesParser()
-  {
-    if( wsdlParser_ == null )
-    {
-      wsdlParser_ = new WebServicesParserExt();  
-    }
-    
-    return wsdlParser_;
-  }
-  /**
-   * @param wsdlParser_ The wsdlParser_ to set.
-   */
-  public void setWebServicesParser(WebServicesParser wsdlParser_)
-  {
-    this.wsdlParser_ = wsdlParser_;
-  }
-/**
- * @param earProjectName The earProjectName to set.
- */
-public void setEarProjectName(String earProjectName) {
-	this.earProjectName_ = earProjectName;
-}
-/**
- * @param existingServerId The existingServerId to set.
- */
-public void setExistingServerId(String existingServerId) {
-	this.existingServerId_ = existingServerId;
-}
-
-/**
- * @return Returns the isRestartProjectNeeded.
- */
-public boolean getIsWebProjectStartupRequested() {
-	return isWebProjectStartupRequested_;
-}
-/**
- * @param isRestartProjectNeeded The isRestartProjectNeeded to set.
- */
-public void setIsWebProjectStartupRequested(boolean isRestartProjectNeeded) {
-	this.isWebProjectStartupRequested_ = isRestartProjectNeeded;
-}
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/AbstractObjectSelectionWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/AbstractObjectSelectionWidget.java
deleted file mode 100644
index a9b313a..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/AbstractObjectSelectionWidget.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.internal.consumption.ui.widgets.object;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.command.env.ui.widgets.SimpleWidgetDataContributor;
-
-
-public abstract class AbstractObjectSelectionWidget extends SimpleWidgetDataContributor implements IObjectSelectionWidget
-{
-  public void setInitialSelection(IStructuredSelection initialSelection)
-  {
-    // subclass should override this method
-  }
-
-  public IStructuredSelection getObjectSelection()
-  {
-    // subclass should override this method
-    return new StructuredSelection();
-  }
-
-  public Status validateSelection(IStructuredSelection objectSelection)
-  {
-    //  subclass should override this method
-    return new SimpleStatus("");
-  }
-
-  public IProject getProject()
-  {
-    //  subclass should override this method
-    return null;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/EJBSelectionWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/EJBSelectionWidget.java
deleted file mode 100644
index 644a99d..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/EJBSelectionWidget.java
+++ /dev/null
@@ -1,287 +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.consumption.ui.widgets.object;
-
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.Session;
-import org.eclipse.jst.j2ee.internal.earcreation.EARNatureRuntime;
-import org.eclipse.jst.j2ee.internal.earcreation.IEARNatureConstants;
-import org.eclipse.jst.j2ee.internal.ejb.project.EJBNatureRuntime;
-import org.eclipse.jst.j2ee.internal.ejb.project.EJBProjectResources;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-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.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.command.env.ui.widgets.WidgetDataEvents;
-
-public class EJBSelectionWidget extends AbstractObjectSelectionWidget implements IObjectSelectionWidget
-{
-  private String pluginId_ = "org.eclipse.jst.ws.consumption.ui";
-  private Combo earList;
-  private EJBTableViewer beanList;
-  private EARNatureRuntime[] earProjects;
-  private Integer selectedBeanIndex = null;
-  private Vector ejbBeanNames;
-  private Vector ejbProjectNames;
-  private Listener  statusListener_;
-  /* CONTEXT_ID PEBD0001 for the EAR Projects drop-down box */
-  private String INFOPOP_PEBD_EAR_PROJECTS = "org.eclipse.jst.ws.consumption.ui.PEBD0001";
-  /* CONTEXT_ID PEBD0002 for the table containing all of the bean names */
-  private String INFOPOP_PEBD_TABLE_BEAN_NAMES = "org.eclipse.jst.ws.consumption.ui.PEBD0002";
-
-  public EJBSelectionWidget()
-  {
-    IProject[] projects = J2EEUtils.getEARProjects();
-    Vector earVector = new Vector();
-    for (int i = 0; i < projects.length; i++)
-    {
-      try
-      {
-        earVector.add(projects[i].getNature(IEARNatureConstants.NATURE_ID));
-      }
-      catch (CoreException ce)
-      {
-      }
-    }
-    earProjects = (EARNatureRuntime[]) earVector.toArray(new EARNatureRuntime[0]);
-  }
-
-  public String getSelectedBean()
-  {
-    if (selectedBeanIndex != null)
-    {
-      return (String) (ejbBeanNames.elementAt(selectedBeanIndex.intValue()));
-    }
-    return null;
-  }
-
-  public String getSelectedProject()
-  {
-    if (selectedBeanIndex != null)
-    {
-      return (String) (ejbProjectNames.elementAt(selectedBeanIndex.intValue()));
-    }
-    return null;
-  }
-
-  public WidgetDataEvents addControls(Composite parent, Listener statusListener)
-  {
-    MessageUtils msgUtils = new MessageUtils(pluginId_ + ".plugin", this);
-    statusListener_  = statusListener;
-    Composite composite = new Composite(parent, SWT.NONE);
-    GridLayout layout = new GridLayout();
-    layout.marginHeight = 0;
-    layout.marginWidth = 0;
-    GridData gd = new GridData(GridData.FILL_BOTH);
-    composite.setLayout(layout);
-    composite.setLayoutData(gd);
-    Composite projectComposite = new Composite(composite, SWT.NONE);
-    layout = new GridLayout();
-    layout.numColumns = 2;
-    projectComposite.setLayout(layout);
-    projectComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.FILL_VERTICAL));
-    new Label(projectComposite, SWT.NULL).setText(msgUtils.getMessage("LABEL_EAR_PROJECTS"));
-    earList = new Combo(projectComposite, SWT.DROP_DOWN | SWT.READ_ONLY);
-    earList.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-    earList.addSelectionListener(new SelectionAdapter()
-    {
-      public void widgetSelected(SelectionEvent evt)
-      {
-        Combo widget = (Combo) (evt.widget);
-        setBeanList(earProjects[widget.getSelectionIndex()]);
-        selectedBeanIndex = null;
-        statusListener_.handleEvent(null);
-      }
-    });
-    addEARNamesToList();
-    earList.setToolTipText(msgUtils.getMessage("TOOLTIP_EAR_PROJECTS"));
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(earList, INFOPOP_PEBD_EAR_PROJECTS);
-    Group beanComposite = new Group(composite, SWT.NONE);
-    layout = new GridLayout();
-    beanComposite.setLayout(layout);
-    beanComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.FILL_VERTICAL));
-    beanComposite.setText(msgUtils.getMessage("LABEL_EJB_BEAN_NAME"));
-    beanList = new EJBTableViewer(beanComposite);
-    Table beanTable = beanList.getTable();
-    gd = new GridData(GridData.FILL_HORIZONTAL | GridData.FILL_VERTICAL);
-    gd.heightHint = 100;
-    beanTable.setLayoutData(gd);
-    beanTable.addSelectionListener(new SelectionAdapter()
-    {
-      public void widgetSelected(SelectionEvent evt)
-      {
-        Table table = (Table) (evt.widget);
-        selectedBeanIndex = new Integer(table.getSelectionIndex());
-        statusListener_.handleEvent(null);
-      }
-    });
-    beanTable.setToolTipText(msgUtils.getMessage("TOOLTIP_TABLE_BEAN_NAMES"));
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(beanTable, INFOPOP_PEBD_TABLE_BEAN_NAMES);
-    if (earProjects != null && earProjects.length > 0)
-    {
-      setBeanList(earProjects[0]);
-    }
-    beanTable.getColumn(0).pack();
-    beanTable.getColumn(1).pack();
-    // This is a dummy label that forces the status label into the second
-    // column.
-    new Label(composite, SWT.NULL).setText("");
-    return this;
-  }
-
-  private void addEARNamesToList()
-  {
-    if (earProjects != null && earProjects.length > 0)
-    {
-      for (int index = 0; index < earProjects.length; index++)
-      {
-        earList.add(earProjects[index].getProject().getName());
-      }
-      earList.setText(earList.getItem(0));
-    }
-  }
-
-  private void setBeanList(EARNatureRuntime earProject)
-  {
-    Vector ejbProjects = J2EEUtils.getEJBProjects(earProject);
-    Table beanTable = beanList.getTable();
-    beanTable.removeAll();
-    ejbBeanNames = new Vector();
-    ejbProjectNames = new Vector();
-    for (int index = 0; index < ejbProjects.size(); index++)
-    {
-      EJBNatureRuntime ejbNature = (EJBNatureRuntime) (ejbProjects.elementAt(index));
-      EJBProjectResources ejbResource = new EJBProjectResources(ejbNature.getProject());
-      EJBJar jar = ejbResource.getEJBJar();
-      Vector beans = J2EEUtils.getBeanNames(jar);
-      String projectName = ejbNature.getProject().getName();
-      ejbBeanNames.addAll(beans);
-      ejbProjectNames.addAll(Collections.nCopies(beans.size(), projectName));
-      ejbResource.cleanup();
-    }
-    beanList.setData(ejbBeanNames, ejbProjectNames);
-    beanList.setInput(ejbBeanNames);
-  }
-
-  public void setInitialSelection(IStructuredSelection initialSelection)
-  {
-    if (initialSelection != null && !initialSelection.isEmpty())
-    {
-      Object object = initialSelection.getFirstElement();
-      if (object instanceof Session)
-      {
-        Session session = (Session) object;
-        EJBJar jar = session.getEjbJar();
-        if (jar != null)
-        {
-          for (int i = 0; i < earProjects.length; i++)
-          {
-            Vector ejbProjects = J2EEUtils.getEJBProjects(earProjects[i]);
-            for (Iterator it = ejbProjects.iterator(); it.hasNext();)
-            {
-              EJBProjectResources ejbResource = new EJBProjectResources(((EJBNatureRuntime) it.next()).getProject());
-              if (ejbResource.getEJBJar() == jar)
-              {
-                earList.setText(earProjects[i].getProject().getName());
-                setBeanList(earProjects[i]);
-                beanList.setSelection(new StructuredSelection(new Integer[]{new Integer(ejbBeanNames.indexOf(session.getName()))}));
-                selectedBeanIndex = new Integer(ejbBeanNames.indexOf(session.getName()));
-                ejbResource.cleanup();
-                return;
-              }
-              ejbResource.cleanup();
-            }
-          }
-        }
-      }
-    }
-  }
-
-  public IStructuredSelection getObjectSelection()
-  {
-    IStructuredSelection sel = (IStructuredSelection) beanList.getSelection();
-    if (sel != null && !sel.isEmpty())
-    {
-      Object object = sel.getFirstElement();
-      if (object instanceof Integer)
-      {
-        String selEJBName = (String) ejbBeanNames.get(((Integer) object).intValue());
-        if (selEJBName != null)
-        {
-          Vector ejbProjects = J2EEUtils.getEJBProjects(earProjects[earList.getSelectionIndex()]);
-          for (Iterator it = ejbProjects.iterator(); it.hasNext();)
-          {
-            EJBProjectResources ejbResource = new EJBProjectResources(((EJBNatureRuntime) it.next()).getProject());
-            EJBJar jar = ejbResource.getEJBJar();
-            java.util.List sessions = jar.getSessionBeans();
-            for (Iterator it2 = sessions.iterator(); it2.hasNext();)
-            {
-              Session session = (Session) it2.next();
-              if (selEJBName.equals(session.getName()))
-              {
-                ejbResource.cleanup();
-                return new StructuredSelection(new Session[]{session});
-              }
-            }
-            ejbResource.cleanup();
-          }
-        }
-      }
-    }
-    return new StructuredSelection(new Object[0]);
-  }
-  
-  public IProject getProject()
-  {
-    String projectName = getSelectedProject();
-    if (projectName != null && projectName.length() > 0)
-      return ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
-    else
-      return null;
-  }
-  
-  public Status validateSelection(IStructuredSelection objectSelection)
-  {
-    return new SimpleStatus("");
-  }
-  
-  public Status getStatus()
-  {  	
-    if (selectedBeanIndex == null)
-    {
-    	return new SimpleStatus("","",Status.ERROR);
-    }
-    
-  	return new SimpleStatus("");
-  }
-  
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/EJBTableViewer.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/EJBTableViewer.java
deleted file mode 100644
index b189f39..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/EJBTableViewer.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.jst.ws.internal.consumption.ui.widgets.object;
-
-import java.util.Vector;
-
-import org.eclipse.jface.viewers.ColumnWeightData;
-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.Viewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-
-public class EJBTableViewer extends TableViewer
-{
-  private String pluginId_ = "org.eclipse.jst.ws.consumption.ui";
-  private Vector beanNames;
-  private Vector projectNames;
-
-  public EJBTableViewer(Composite parent)
-  {
-    super(parent, SWT.SINGLE | SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL | SWT.FULL_SELECTION);
-    MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
-    String columnProperties[] = {msgUtils.getMessage("TABLE_TITLE_EJB_BEAN_NAMES"), msgUtils.getMessage("TABLE_TITLE_EJB_PROJECT_NAME")};
-    Table table = getTable();
-    table.setHeaderVisible(true);
-    table.setLinesVisible(true);
-    TableLayout layout = new TableLayout();
-    for (int i = 0; i < columnProperties.length; i++)
-    {
-      TableColumn column = new TableColumn(table, i);
-      column.setText(columnProperties[i]);
-      column.setAlignment(SWT.LEFT);
-      layout.addColumnData(new ColumnWeightData(50, 80, true));
-    }
-    table.setLayout(layout);
-    setColumnProperties(columnProperties);
-    setContentProvider(new EJBContentProvider());
-    setLabelProvider(new EJBLabelProvider());
-  }
-
-  public void setData(Vector beanNames, Vector projectNames)
-  {
-    this.beanNames = beanNames;
-    this.projectNames = projectNames;
-  }
-  private class EJBLabelProvider extends LabelProvider implements ITableLabelProvider
-  {
-    public String getColumnText(Object object, int columnIndex)
-    {
-      String result = null;
-      if (object instanceof Integer)
-      {
-        int index = ((Integer) object).intValue();
-        if (columnIndex == 0)
-        {
-          return (String) (beanNames.elementAt(index));
-        }
-        else if (columnIndex == 1)
-        {
-          return (String) (projectNames.elementAt(index));
-        }
-      }
-      return result;
-    }
-
-    public Image getColumnImage(Object object, int columnIndex)
-    {
-      return null;
-    }
-  }
-  public class EJBContentProvider implements IStructuredContentProvider
-  {
-    public Object[] getElements(Object element)
-    {
-      if (beanNames != null)
-      {
-        int size = beanNames.size();
-        Object[] result = new Object[size];
-        for (int index = 0; index < size; index++)
-        {
-          result[index] = new Integer(index);
-        }
-        return result;
-      }
-      return null;
-    }
-
-    public void dispose()
-    {
-    }
-
-    public void inputChanged(Viewer viewer, Object old, Object newobj)
-    {
-    }
-
-    public boolean isDeleted(Object object)
-    {
-      return false;
-    }
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/HandlerTableItem.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/HandlerTableItem.java
deleted file mode 100644
index a7be6f4..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/HandlerTableItem.java
+++ /dev/null
@@ -1,114 +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.consumption.ui.widgets.object;
-
-import org.eclipse.jst.j2ee.webservice.wsdd.PortComponent;
-
-
-
-public class HandlerTableItem {
-  
-  private String handlerClassName;
-  private String handlerName;
-  private String portName;
-  private int index;
-  
-  private PortComponent port;
-  private Object handler;
-  private Object wsDescRef;
-
-  /**
-   * @return Returns the handlerClassName.
-   */
-  public String getHandlerClassName() {
-    return handlerClassName;
-  }
-  /**
-   * @param handlerClassName The handlerClassName to set.
-   */
-  public void setHandlerClassName(String handlerClassName) {
-    this.handlerClassName = handlerClassName;
-  }
-  /**
-   * @return Returns the handlerName.
-   */
-  public String getHandlerName() {
-    return handlerName;
-  }
-  /**
-   * @param handlerName The handlerName to set.
-   */
-  public void setHandlerName(String handlerName) {
-    this.handlerName = handlerName;
-  }
-  /**
-   * @return Returns the port.
-   */
-  public PortComponent getPort() {
-    return port;
-  }
-  /**
-   * @param port The port to set.
-   */
-  public void setPort(PortComponent port) {
-    this.port = port;
-  }
-  /**
-   * @return Returns the handler.
-   */
-  public Object getHandler() {
-    return handler;
-  }
-  /**
-   * @param handler The handler to set.
-   */
-  public void setHandler(Object handler) {
-    this.handler = handler;
-  }
-  /**
-   * @return Returns the portName.
-   */
-  public String getPortName() {
-    return portName;
-  }
-  /**
-   * @param portName The portName to set.
-   */
-  public void setPortName(String portName) {
-    this.portName = portName;
-  }
-
-  /**
-   * @return Returns the index.
-   */
-  public int getIndex() {
-    return index;
-  }
-  /**
-   * @param index The index to set.
-   */
-  public void setIndex(int index) {
-    this.index = index;
-  }
-  /**
-   * @return Returns the wsDescRef.
-   */
-  public Object getWsDescRef() {
-    return wsDescRef;
-  }
-  /**
-   * @param wsDescRef The wsDescRef to set.
-   */
-  public void setWsDescRef(Object wsDescRef) {
-    this.wsDescRef = wsDescRef;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/IObjectSelectionWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/IObjectSelectionWidget.java
deleted file mode 100644
index da78638..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/IObjectSelectionWidget.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.consumption.ui.widgets.object;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.command.env.ui.widgets.WidgetDataContributor;
-
-/**
- * This interface defines extra methods that Object Selection Widgets
- * need to implement.  Object Selection Widgets are displayed on page 2
- * of the Web services wizard.
- */
-public interface IObjectSelectionWidget extends WidgetDataContributor
-{
-  /**
-   * The framework will call this method to set the initial selection
-   * value that the user has specified.
-   * 
-   * @param initialSelection the initial selection the user specified.
-   */
-  public void setInitialSelection(IStructuredSelection initialSelection);
-  
-  /**
-   * The intent of the Object Selection Widget is that the user has
-   * the opportunity change/find the object that they want to turn into
-   * a Web service.
-   * 
-   * @return returns the an IStructuredSelection object that the user
-   * want to turn into a Web service.  This object may be different than
-   * the initialSelection passed in by the setInitialSelection method.
-   */
-  public IStructuredSelection getObjectSelection();
-  
-  /**
-   * Validates whether the objectSelection parameter is valid for
-   * this Object selection widget.  An error status should be returned
-   * if this object is not value.  Otherwise, and ok status should be
-   * returned
-   * 
-   * @param objectSelection the object to be validated.
-   * @return the status of the validation.
-   */
-  public Status validateSelection(IStructuredSelection objectSelection);
-  
-  /**
-   * 
-   * @return returns the IProject that contains the selection
-   * object that the user has chosen with this widget.  The value can be 
-   * null if there is no IProject for this object.
-   */
-  public IProject getProject();
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/JavaBeanSelectionTransformer.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/JavaBeanSelectionTransformer.java
deleted file mode 100644
index da8148b..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/JavaBeanSelectionTransformer.java
+++ /dev/null
@@ -1,56 +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.consumption.ui.widgets.object;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.wst.command.env.core.data.Transformer;
-
-public class JavaBeanSelectionTransformer implements Transformer
-{
-  public Object transform(Object value)
-  {
-    if (value instanceof IStructuredSelection)
-    {
-      Object sel = ((IStructuredSelection)value).getFirstElement();
-      if (sel instanceof IFile)
-      {
-        return new StructuredSelection(computeFullyQualifiedJavaName((IFile)sel));
-      }
-      else if (sel instanceof ICompilationUnit)
-      {
-        IResource res = ((ICompilationUnit)sel).getResource();
-        if (res instanceof IFile)
-          return new StructuredSelection(computeFullyQualifiedJavaName((IFile)res));
-      }
-    }
-    return value;
-  }
-
-  private String computeFullyQualifiedJavaName(IFile resource)
-  {
-    IPath path = resource.getFullPath();
-    String basename = path.lastSegment();
-    String beanClass = "";
-    if (basename != null && basename.length() > 0)
-    {
-      String beanPackage = org.eclipse.jst.ws.internal.common.ResourceUtils.getJavaResourcePackageName(path);
-      beanClass = (beanPackage == null ? basename : (beanPackage + "." + basename));
-      if (beanClass.toLowerCase().endsWith(".java") || beanClass.toLowerCase().endsWith(".class"))
-        beanClass = beanClass.substring(0, beanClass.lastIndexOf('.'));
-    }
-    return beanClass;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/JavaBeanSelectionWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/JavaBeanSelectionWidget.java
deleted file mode 100644
index 5cfe521..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/JavaBeanSelectionWidget.java
+++ /dev/null
@@ -1,253 +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.consumption.ui.widgets.object;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.wizard.IWizardContainer;
-import org.eclipse.jst.j2ee.webservice.wsdd.BeanLink;
-import org.eclipse.jst.j2ee.webservice.internal.wsdd.impl.PortComponentImpl;
-import org.eclipse.jst.j2ee.webservice.internal.wsdd.impl.ServiceImplBeanImpl;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.common.JavaResourceFilter;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.jst.ws.internal.ui.dialog.DialogUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.command.env.ui.widgets.WidgetDataEvents;
-
-public class JavaBeanSelectionWidget extends AbstractObjectSelectionWidget implements IObjectSelectionWidget
-{
-  private String             pluginId_ = "org.eclipse.jst.ws.consumption.ui";
-  private IProject           serverProject_ = null;
-  private Composite          parent_ = null;
-  private IWizardContainer   context_ = null;
-  private JavaResourceFilter filter_ = new JavaResourceFilter();
-  private IResource          initialResource_ = null;
-  private Listener statusListener;
-  
-  /*CONTEXT_ID PBCL0001 for the Bean Selection Page*/
-  private String INFOPOP_PBCL_PAGE = "PBCL0001";
-  
-  private Text beanClassText_;
-  /*CONTEXT_ID PBCL0002 for the Bean Selection field of the Bean Selection Page*/
-  private String INFOPOP_PBCL_TEXT_BEAN_CLASS = "PBCL0002";
-
-  private Button beanClassBrowseButton_;
-  /*CONTEXT_ID PBCL0003 for the Bean Class Browse button of the Bean Selection Page*/
-  private String INFOPOP_PBCL_BUTTON_BEAN_CLASS_BROWSE = "PBCL0003";
-
-  private Button beanResourceBrowseButton_;
-  /*CONTEXT_ID PBCL0004 for the Bean Resource Browse button of the Bean Selection Page*/
-  private String INFOPOP_PBCL_BUTTON_BEAN_RESOURCE_BROWSE = "PBCL0004";
-   
-  public WidgetDataEvents addControls( Composite parent, Listener statusListener )
-  {
-    this.statusListener = statusListener;
-    MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
-    UIUtils      uiUtils  = new UIUtils(msgUtils, pluginId_ ); 
-    
-    parent_ = parent;
-    
-    Composite group = uiUtils.createComposite( parent, 4 );
-    
-    group.setToolTipText( msgUtils.getMessage("TOOLTIP_PBCL_PAGE") );
-    PlatformUI.getWorkbench().getHelpSystem().setHelp( group, pluginId_ + "." + INFOPOP_PBCL_PAGE );
-    
-    beanClassText_ = uiUtils.createText( group, "LABEL_BEAN_CLASS_NAME",
-                                         "TOOLTIP_PBCL_TEXT_BEAN_CLASS",
-                                         INFOPOP_PBCL_TEXT_BEAN_CLASS,
-                                         SWT.SINGLE | SWT.BORDER);
-    beanClassText_.addModifyListener(
-      new ModifyListener()
-      {
-        public void modifyText(ModifyEvent e)
-        {
-          handleModifyBeanClassText();
-        }
-      }
-    );
-    
-    beanClassBrowseButton_ = uiUtils.createPushButton( group, "BUTTON_BROWSE_CLASSES",
-                                                       "TOOLTIP_PBCL_BUTTON_BEAN_CLASS_BROWSE",
-                                                       INFOPOP_PBCL_BUTTON_BEAN_CLASS_BROWSE );
-    beanClassBrowseButton_.addSelectionListener( new SelectionAdapter()
-                                                 {
-                                                   public void widgetSelected( SelectionEvent evt )
-                                                   {
-                                                     handleBrowseClasses();  
-                                                   }
-                                                 } );
-    
-    beanResourceBrowseButton_ = uiUtils.createPushButton( group, "BUTTON_BROWSE_FILES",
-                                                          "TOOLTIP_PBCL_BUTTON_BEAN_RESOURCE_BROWSE",
-                                                          INFOPOP_PBCL_BUTTON_BEAN_RESOURCE_BROWSE );
-    beanResourceBrowseButton_.addSelectionListener( new SelectionAdapter()
-                                                    {
-                                                      public void widgetSelected( SelectionEvent evt )
-                                                      {
-                                                        handleBrowseFiles();  
-                                                      }
-                                                    } );
-    return this;
-  }
-  
-  private void handleModifyBeanClassText()
-  {
-    statusListener.handleEvent(null);
-    serverProject_ = null;
-  }
-
-  private void handleBrowseClasses()
-  {
-    Shell shell = parent_.getShell();
-    IType itype = DialogUtils.browseClassesAsIType(shell, ResourcesPlugin.getWorkspace().getRoot().getProjects(), new ProgressMonitorDialog(shell));
-    if (itype != null)
-    {
-      beanClassText_.setText(itype.getFullyQualifiedName());
-      try
-      {
-        IResource res = itype.getCorrespondingResource();
-        if (res != null)
-          serverProject_ = res.getProject();
-        else
-          serverProject_ = null;
-      }
-      catch (JavaModelException jme)
-      {
-        serverProject_ = null;
-      }
-    }
-  }
-  
-  private void handleBrowseFiles()
-  {
-    IResource topResource = ResourceUtils.getWorkspaceRoot();
-    IResource resource = DialogUtils.browseResources( parent_.getShell(), topResource, initialResource_, filter_ );
-    setBeanClass(resource);
-  }
-  
-  private void setBeanClass(IResource resource)
-  {
-    if( resource != null && resource instanceof IFile )
-    {
-      IPath  path     = resource.getFullPath();
-      String basename = path.lastSegment();
-      
-      if( basename != null && basename.length() > 0 )
-      {
-        String beanPackage = org.eclipse.jst.ws.internal.common.ResourceUtils.getJavaResourcePackageName(path);
-        String beanClass = (beanPackage == null ? basename : (beanPackage + "." + basename));
-        
-        if( beanClass.toLowerCase().endsWith(".java") || beanClass.toLowerCase().endsWith(".class" ) )
-        {
-          beanClass = beanClass.substring( 0, beanClass.lastIndexOf('.') );
-        }
-        
-        beanClassText_.setText(beanClass);
-        serverProject_ =  ResourceUtils.getProjectOf(path);
-      }
-    }
-  }
-
-  private void setBeanClass(ServiceImplBeanImpl serviceImpl)
-  {
-    if( serviceImpl != null )
-    {
-      EObject eObject = serviceImpl.eContainer();
-      if(eObject instanceof PortComponentImpl){
-      	PortComponentImpl pci = (PortComponentImpl)eObject;
-      	String beanClass = pci.getServiceEndpointInterface();
-      	beanClassText_.setText(beanClass);
-      }
-    }
-  }
-  
-  private void setBeanClass(BeanLink serviceImpl)
-  {
-    if( serviceImpl != null )
-    {
-      EObject eObject = serviceImpl.eContainer();
-      if(eObject instanceof ServiceImplBeanImpl){
-      	setBeanClass((ServiceImplBeanImpl)eObject);
-      }
-    }
-  }
-  
-  public void setInitialSelection(IStructuredSelection initialSelection)
-  {
-    if (initialSelection != null && !initialSelection.isEmpty())
-    {
-      Object object = initialSelection.getFirstElement();
-      if (object instanceof IFile)
-      {
-      	IFile iFile = (IFile)object;
-      	String fileExt = iFile.getFileExtension().toLowerCase();
-      	if (fileExt.equals("java") || fileExt.equals("class"))
-          setBeanClass(iFile);
-      }
-      else if (object instanceof ICompilationUnit)
-      	setBeanClass(((ICompilationUnit)object).getResource());
-      else if (object instanceof ServiceImplBeanImpl)
-      	setBeanClass((ServiceImplBeanImpl)object);
-      else if(object instanceof BeanLink)
-      	setBeanClass((BeanLink)object);
-    }
-  }
-  
-  public IStructuredSelection getObjectSelection()
-  {
-    return new StructuredSelection(beanClassText_.getText());
-  }
-  
-  public IProject getProject()
-  {
-    return serverProject_;
-  }
-  
-  public Status getStatus()
-  {
-    String beanClassName = beanClassText_.getText().trim();
-    if (beanClassName == null || beanClassName.length() <= 0)
-    {
-      MessageUtils msgUtils = new MessageUtils(pluginId_ + ".plugin", this);
-      return new SimpleStatus("", msgUtils.getMessage("PAGE_MSG_BEAN_CANNOT_BE_EMPTY"), Status.ERROR);
-    }
-    return new SimpleStatus("");
-  }
-  
-  public Status validateSelection(IStructuredSelection objectSelection)
-  {
-    return new SimpleStatus("");
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionFragment.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionFragment.java
deleted file mode 100644
index e4ca649..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionFragment.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.internal.consumption.ui.widgets.object;
-
-import org.eclipse.jst.ws.internal.consumption.ui.wizard.IWebServiceType;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.jst.ws.internal.wsrt.WebServiceRuntimeExtensionUtils;
-import org.eclipse.wst.command.env.core.common.Condition;
-import org.eclipse.wst.command.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.env.core.fragment.BooleanFragment;
-import org.eclipse.wst.command.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.env.ui.widgets.SelectionCommand;
-
-
-public class ObjectSelectionFragment extends SequenceFragment implements Condition
-{
-  private TypeRuntimeServer typeRuntimeServer;
-  private boolean hasObjectSelectionWidget;
-
-  public ObjectSelectionFragment()
-  {
-    super();
-    BooleanFragment boolFragment = new BooleanFragment(new SimpleFragment("ObjectSelectionWidget"), new SimpleFragment(""), this);
-    add(boolFragment);
-    add(new SimpleFragment(new ObjectSelectionOutputCommand(), ""));
-    hasObjectSelectionWidget = false;
-  }
-
-  /**
-   *  This method is called retrieve the data mappings for this command fragment.
-   */
-  public void registerDataMappings(DataMappingRegistry dataRegistry)
-  {
-    dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ObjectSelectionWidget.class );
-    dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ObjectSelectionOutputCommand.class, "ObjectSelection", null);
-    dataRegistry.addMapping(ObjectSelectionFragment.class, "TypeRuntimeServer", ObjectSelectionWidget.class);
-    dataRegistry.addMapping(ObjectSelectionFragment.class, "TypeRuntimeServer", ObjectSelectionOutputCommand.class);
-    
-    dataRegistry.addMapping(ObjectSelectionWidget.class, "ObjectSelection", ObjectSelectionOutputCommand.class);
-    dataRegistry.addMapping(ObjectSelectionWidget.class, "Project", ObjectSelectionOutputCommand.class);
-  }
-
-  public boolean evaluate()
-  {
-    return hasObjectSelectionWidget;
-  }
-
-  public TypeRuntimeServer getTypeRuntimeServer()
-  {
-    return typeRuntimeServer;
-  }
-
-  /**
-   * @param typeRuntimeServer The typeRuntimeServer to set.
-   */
-  public void setTypeRuntimeServer(TypeRuntimeServer typeRuntimeServer)
-  {
-    this.typeRuntimeServer = typeRuntimeServer;
-    if (typeRuntimeServer != null)
-    {
-	  // rskreg
-      //IWebServiceType wst = WebServiceServerRuntimeTypeRegistry.getInstance().getWebServiceTypeById(typeRuntimeServer.getTypeId());
-	  IWebServiceType wst = WebServiceRuntimeExtensionUtils.getWebServiceTypeById(typeRuntimeServer.getTypeId());
-	  // rskreg
-      if (wst != null)
-      {
-        String objectSelectionWidgetId = wst.getObjectSelectionWidget();
-        hasObjectSelectionWidget = objectSelectionWidgetId != null && objectSelectionWidgetId.length() > 0;
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionOutputCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionOutputCommand.java
deleted file mode 100644
index 750cc0d..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionOutputCommand.java
+++ /dev/null
@@ -1,207 +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.consumption.ui.widgets.object;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.wizard.IWebServiceType;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.jst.ws.internal.wsrt.WebServiceRuntimeExtensionUtils;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.command.env.core.common.StatusException;
-import org.eclipse.wst.command.env.core.data.Transformer;
-import org.eclipse.wst.ws.parser.wsil.WebServicesParser;
-
-
-public class ObjectSelectionOutputCommand extends SimpleCommand
-{
-  private String                 objectSelectionWidgetId_;
-  private IStructuredSelection   objectSelection_;
-  private IObjectSelectionWidget objectSelectionWidget_;
-  private IProject               project_;
-  private WebServicesParser      parser_;
-
-  public Status execute(Environment env)
-  {
-    // Transformation
-    if (objectSelectionWidgetId_ != null && objectSelectionWidgetId_.length() > 0)
-    {
-      IConfigurationElement[] elements = ObjectSelectionRegistry.getInstance().getConfigurationElements();
-      for (int i = 0; i < elements.length; i++)
-      {
-        if (objectSelectionWidgetId_.equals(elements[i].getAttribute("id")))
-        {
-          String transformerId = elements[i].getAttribute("transformer");
-          if (transformerId != null && transformerId.length() > 0)
-          {
-            try
-            {
-              Object transformer = elements[i].createExecutableExtension("transformer");
-              if (transformer instanceof Transformer)
-              {
-                Object transformedSelection = ((Transformer)transformer).transform(objectSelection_);
-                if (transformedSelection instanceof IStructuredSelection)
-                  objectSelection_ = (IStructuredSelection)transformedSelection;
-              }
-            }
-            catch (CoreException ce)
-            {
-            }
-          }
-        }
-      }
-    }
-	
-    // Validation
-    Status status = (objectSelectionWidget_ != null) ? objectSelectionWidget_.validateSelection(getObjectSelection()) : new SimpleStatus("");
-    if (status.getSeverity() != Status.OK)
-    {
-      try
-      {
-        env.getStatusHandler().report(status);
-      }
-      catch (StatusException se)
-      {
-      }
-    }
-	
-    return status;
-  }
-
-  /**
-   * @param typeRuntimeServer The typeRuntimeServer to set.
-   */
-  public void setTypeRuntimeServer(TypeRuntimeServer typeRuntimeServer)
-  {
-    if (typeRuntimeServer != null)
-    {
-	  // rskreg
-      //IWebServiceType wst = WebServiceServerRuntimeTypeRegistry.getInstance().getWebServiceTypeById(typeRuntimeServer.getTypeId());
-	  IWebServiceType wst = WebServiceRuntimeExtensionUtils.getWebServiceTypeById(typeRuntimeServer.getTypeId());
-	  // rskreg
-      if (wst != null)
-      {
-        objectSelectionWidgetId_ = wst.getObjectSelectionWidget();
-        
-        if (objectSelectionWidgetId_ != null && objectSelectionWidgetId_.length() > 0)
-        {
-          IConfigurationElement[] elements = ObjectSelectionRegistry.getInstance().getConfigurationElements();
-          for (int i = 0; i < elements.length; i++)
-          {
-            if (objectSelectionWidgetId_.equals(elements[i].getAttribute("id")))
-            {
-              try
-              {
-                Object object = elements[i].createExecutableExtension("class");
-                if (object instanceof IObjectSelectionWidget)
-                {
-                  objectSelectionWidget_ = (IObjectSelectionWidget)object;
-                  return;
-                }
-              }
-              catch (CoreException ce)
-              {
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-
-  /**
-   * @return Returns the selection.
-   */
-  public IStructuredSelection getObjectSelection()
-  {
-    return objectSelection_;
-  }
-  /**
-   * @param selection The selection to set.
-   */
-  public void setObjectSelection(IStructuredSelection objectSelection)
-  {
-    objectSelection_ = objectSelection;
-    
-    //Set the project if you can
-    if (project_==null)
-    {
-      project_ = getProjectFromObjectSelection(objectSelection);
-    }
-    
-    // Check if this is a WSDL selection object.  If it is we need
-    // to unwrap it.
-    if( objectSelection != null && !objectSelection.isEmpty() )
-    {
-      Object object = objectSelection.getFirstElement();
-      
-      if( object instanceof WSDLSelectionWrapper )
-      {
-        WSDLSelectionWrapper wsdlWrapper = (WSDLSelectionWrapper)object;
-        
-        objectSelection_ = wsdlWrapper.wsdlSelection;
-        parser_          = wsdlWrapper.parser;
-      }
-    }
-  }
-  
-  public IProject getProject()
-  {
-    return project_;
-  }
-  
-  public void setProject(IProject project)
-  {
-    this.project_ = project;
-  }
-  
-  
-  /**
-   * @return Returns the parser_.
-   */
-  public WebServicesParser getWebServicesParser()
-  {
-    return parser_;
-  }
-  
-  private IProject getProjectFromObjectSelection(IStructuredSelection selection)
-  {
-    if (selection != null && selection.size() == 1)
-    {
-      Object obj = selection.getFirstElement();
-      if (obj != null) 
-      {
-        try
-        { 
-          IResource resource = ResourceUtils.getResourceFromSelection(obj);
-		  System.out.println("getProjectFromObjectSelection - resource = "+resource);
-          if (resource==null) 
-            return null;
-          IProject p = ResourceUtils.getProjectOf(resource.getFullPath());
-		  System.out.println("ObjectSelection project = "+p);
-          return p;
-        } catch(CoreException e)
-        {
-			e.printStackTrace();
-          return null;
-        }        
-      }
-    }
-    return null;
-  }  
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionRegistry.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionRegistry.java
deleted file mode 100644
index 8cdbd64..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionRegistry.java
+++ /dev/null
@@ -1,37 +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.consumption.ui.widgets.object;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.Platform;
-
-public class ObjectSelectionRegistry
-{
-  private static ObjectSelectionRegistry instance;
-  private static IConfigurationElement[] elements;
-  
-  private ObjectSelectionRegistry()
-  {
-    elements = Platform.getExtensionRegistry().getConfigurationElementsFor("org.eclipse.jst.ws.consumption.ui", "objectSelectionWidget");
-  }
-  
-  public static ObjectSelectionRegistry getInstance()
-  {
-    if (instance == null)
-      instance = new ObjectSelectionRegistry();
-    return instance;
-  }
-
-  public IConfigurationElement[] getConfigurationElements()
-  {
-    return elements;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionWidget.java
deleted file mode 100644
index f6a1654..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionWidget.java
+++ /dev/null
@@ -1,178 +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.consumption.ui.widgets.object;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.wizard.IWebServiceType;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.jst.ws.internal.wsrt.WebServiceRuntimeExtensionUtils;
-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.Listener;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.command.env.ui.widgets.WidgetDataEvents;
-
-
-public class ObjectSelectionWidget extends AbstractObjectSelectionWidget implements IObjectSelectionWidget
-{
-  private IConfigurationElement[] elements;
-  private Composite parent;
-  private Listener statusListener;
-  private Composite composite;
-  private TypeRuntimeServer typeRuntimeServer;
-  private IStructuredSelection initialSelection;
-  private IProject project;
-  private IObjectSelectionWidget child;
-  
-  public WidgetDataEvents addControls(Composite parent, Listener statusListener)
-  {
-	  System.out.println("ObjectSelectionWidget - - 1");	  
-    elements = ObjectSelectionRegistry.getInstance().getConfigurationElements();
-    this.parent = parent;
-    this.statusListener = statusListener;
-    composite = null;
-	System.out.println("ObjectSelectionWidget - - 2");		
-    return this;
-  }
-  
-  /**
-   * @param typeRuntimeServer The typeRuntimeServer to set.
-   */
-  public void setTypeRuntimeServer(TypeRuntimeServer typeRuntimeServer)
-  {
-    this.typeRuntimeServer = typeRuntimeServer;
-    if (composite != null)
-    {
-      composite.dispose();
-      child = null;
-    }
-    if (typeRuntimeServer != null)
-    {
-		// rskreg
-      //IWebServiceType wst = WebServiceServerRuntimeTypeRegistry.getInstance().getWebServiceTypeById(typeRuntimeServer.getTypeId());
-	  IWebServiceType wst = WebServiceRuntimeExtensionUtils.getWebServiceTypeById(typeRuntimeServer.getTypeId());
-	  // rskreg
-      if (wst != null)
-      {
-        String objectSelectionWidgetId = wst.getObjectSelectionWidget();
-        if (objectSelectionWidgetId != null && objectSelectionWidgetId.length() > 0)
-        {
-          for (int i = 0; i < elements.length; i++)
-          {
-            if (objectSelectionWidgetId.equals(elements[i].getAttribute("id")))
-            {
-              try
-              {
-                Object object = elements[i].createExecutableExtension("class");
-                if (object instanceof IObjectSelectionWidget)
-                {
-                  Control shell = parent.getShell();
-                  int x = shell.getSize().x;
-                  composite = new Composite(parent, SWT.NONE);
-                  GridLayout gl = new GridLayout();
-                  gl.marginHeight = 0;
-                  gl.marginWidth = 0;
-                  GridData gd = new GridData(GridData.FILL_BOTH);
-                  composite.setLayout(gl);
-                  composite.setLayoutData(gd);
-                  child = (IObjectSelectionWidget)object;
-                  child.addControls(composite, statusListener);
-                  child.setInitialSelection(initialSelection);
-                  composite.setSize(x-20, composite.computeSize(SWT.DEFAULT, SWT.DEFAULT).y);
-                  parent.setSize(x-10, parent.computeSize(SWT.DEFAULT, SWT.DEFAULT).y);
-                  shell.setSize(x, shell.computeSize(SWT.DEFAULT, SWT.DEFAULT).y);
-                  shell.setRedraw(true);
-                  shell.redraw();
-                  shell.update();
-                  return;
-                }
-              }
-              catch (CoreException ce)
-              {
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  
-  public Status getStatus()
-  {
-    return (child != null) ? child.getStatus() : new SimpleStatus("");
-  }
-
-  public void setInitialSelection(IStructuredSelection initialSelection)
-  {
-    this.initialSelection = initialSelection;
-    project = getProjectFromInitialSelection(initialSelection);
-    if (child != null)
-      child.setInitialSelection(initialSelection);
-  }
-    
-  public IStructuredSelection getObjectSelection()
-  {
-    return (child != null) ? child.getObjectSelection() : null;
-  }
-  
-  public Status validateSelection(IStructuredSelection objectSelection)
-  {
-    return (child != null) ? child.validateSelection(objectSelection) : new SimpleStatus("");
-  }
-  
-  public IProject getProject()
-  {
-    if (child != null)
-    {
-      IProject p = child.getProject();
-      if (p != null)
-        return p;
-      else
-        return project;
-    }
-    else
-    {
-      return null;
-    }
-  }
-  
-  private IProject getProjectFromInitialSelection(IStructuredSelection selection)
-  {
-    if (selection != null && selection.size() == 1)
-    {
-      Object obj = selection.getFirstElement();
-      if (obj != null) 
-      {
-        try
-        { 
-          IResource resource = ResourceUtils.getResourceFromSelection(obj);
-          if (resource==null) 
-            return null;
-          IProject p = ResourceUtils.getProjectOf(resource.getFullPath());
-          return p;
-        } catch(CoreException e)
-        {
-          return null;
-        }        
-      }
-    }
-    return null;
-  }  
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/Timer.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/Timer.java
deleted file mode 100644
index 546120c..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/Timer.java
+++ /dev/null
@@ -1,72 +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.consumption.ui.widgets.object;
-
-import java.util.Calendar;
-
-import org.eclipse.swt.widgets.Display;
-
-public class Timer extends Thread
-{
-  private static Timer instance = null;
-  private final long ONE_SECOND = 1000;
-  private long refreshTime;
-  private Display display;
-  private Runnable runnable;
-
-  private Timer(Display display, Runnable runnable)
-  {
-    this.display = display;
-    this.runnable = runnable;
-  }
-
-  public synchronized static Timer newInstance(Display display, Runnable runnable)
-  {
-    if (instance == null)
-      instance = new Timer(display, runnable);
-    return instance;
-  }
-  
-  public synchronized static boolean isRunning()
-  {
-    return instance != null;
-  }
-
-  public synchronized void startTimer()
-  {
-    refreshTime = getCurrentTime() + ONE_SECOND;
-    if (!isAlive())
-      this.start();
-  }
-
-  private long getCurrentTime()
-  {
-    return Calendar.getInstance().getTime().getTime();
-  }
-
-  public void run()
-  {
-    long currTime = getCurrentTime();
-    while (currTime < refreshTime)
-    {
-      try
-      {
-        sleep(refreshTime - currTime);
-      }
-      catch (InterruptedException ie)
-      {
-      }
-      currTime = getCurrentTime();
-    }
-    instance = null;
-    display.syncExec(runnable);
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/WSDLSelectionTransformer.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/WSDLSelectionTransformer.java
deleted file mode 100644
index 1942ccb..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/WSDLSelectionTransformer.java
+++ /dev/null
@@ -1,56 +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.consumption.ui.widgets.object;
-
-import java.net.MalformedURLException;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.j2ee.webservice.internal.wsclient.impl.ServiceRefImpl;
-import org.eclipse.jst.ws.internal.common.J2EEActionAdapterFactory;
-import org.eclipse.wst.command.env.core.data.Transformer;
-import org.eclipse.wst.wsdl.internal.impl.ServiceImpl;
-import org.eclipse.wst.wsdl.util.WSDLResourceImpl; 
-
-public class WSDLSelectionTransformer implements Transformer
-{
-  public Object transform(Object value)
-  {
-    if (value instanceof IStructuredSelection)
-    {
-      Object sel = ((IStructuredSelection)value).getFirstElement();
-      if (sel instanceof IResource)
-      {
-        try
-        {
-          return new StructuredSelection(((IResource)sel).getLocation().toFile().toURL().toString());
-        }
-        catch (MalformedURLException murle)
-        {
-        }
-      }
-      else if (sel instanceof ServiceImpl)
-      {
-        return new StructuredSelection(J2EEActionAdapterFactory.getWSDLURI((ServiceImpl)sel));
-      }
-      else if (sel instanceof ServiceRefImpl)
-      {
-        return new StructuredSelection(J2EEActionAdapterFactory.getWSDLURI((ServiceRefImpl)sel));
-      }
-      else if (sel instanceof WSDLResourceImpl)
-      {
-        return new StructuredSelection(J2EEActionAdapterFactory.getWSDLURI((WSDLResourceImpl)sel));
-      }
-    }
-    return value;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/WSDLSelectionWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/WSDLSelectionWidget.java
deleted file mode 100644
index dfcd0f9..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/WSDLSelectionWidget.java
+++ /dev/null
@@ -1,355 +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.consumption.ui.widgets.object;
-
-import java.io.File;
-import java.net.MalformedURLException;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.ws.internal.common.J2EEActionAdapterFactory;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.WSDLSelectionConditionCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.WSDLSelectionTreeWidget;
-import org.eclipse.jst.ws.internal.ui.common.DialogResourceBrowser;
-import org.eclipse.jst.ws.internal.ui.common.FileExtensionFilter;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-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.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.command.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.ws.parser.discovery.WebServicesParserExt;
-import org.eclipse.wst.ws.parser.wsil.WebServiceEntity;
-import org.eclipse.wst.ws.parser.wsil.WebServicesParser;
-import org.eclipse.wst.wsdl.internal.impl.ServiceImpl;
-import org.eclipse.wst.wsdl.util.WSDLResourceImpl;
-
-public class WSDLSelectionWidget extends AbstractObjectSelectionWidget implements IObjectSelectionWidget, Runnable
-{
-  private String              pluginId_;
-  private MessageUtils        msgUtils_;
-  private FileExtensionFilter wsFilter_;
-  private WebServicesParser webServicesParser;
-
-  private Composite parent_;
-  private Listener  statusListener_;
-  private WSDLSelectionTreeWidget tree;
-  
-  /*CONTEXT_ID PCON0001 for the WSDL Selection Page*/
-  private final String INFOPOP_PCON_PAGE = "PCON0001";
-
-  /*CONTEXT_ID PCON0002 for the WSDL Document text field of the WSDL Selection Page*/
-  private final String INFOPOP_PCON_TEXT_WSDL = "PCON0002";
-  private Text webServiceURI;
-
-  /*CONTEXT_ID PCON0003 for the WSDL Resource Browse button of the WSDL Selection Page*/
-  private final String INFOPOP_PCON_BUTTON_BROWSE_WSDL = "PCON0003";
-  private Button wsBrowseButton_;
-  
-  public WSDLSelectionWidget()
-  {
-    pluginId_ = "org.eclipse.jst.ws.consumption.ui";
-    msgUtils_ = new MessageUtils( pluginId_ + ".plugin", this );
-    wsFilter_ = new FileExtensionFilter(new String[] {"wsdl", "wsil", "html"});
-    webServicesParser = new WebServicesParserExt();
-  }
-  
-  public WidgetDataEvents addControls( Composite parent, Listener statusListener )
-  {
-    UIUtils uiUtils  = new UIUtils( msgUtils_, pluginId_ );
-    parent_          = parent;
-    statusListener_  = statusListener;
-
-	  parent.setToolTipText( msgUtils_.getMessage( "TOOLTIP_PCON_PAGE" ) );
-	  PlatformUI.getWorkbench().getHelpSystem().setHelp( parent, pluginId_ + "." + INFOPOP_PCON_PAGE );
-    
-    Composite wsdlGroup = uiUtils.createComposite( parent, 2, 5, 0 );
-    
-    Label wsLabel = new Label( wsdlGroup, SWT.WRAP);
-    wsLabel.setText( msgUtils_.getMessage("LABEL_WS_SELECTION"));
-    GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-    gd.horizontalSpan = 2;
-    wsLabel.setLayoutData(gd);
-    wsLabel.setToolTipText( msgUtils_.getMessage("TOOLTIP_PCON_TEXT_WS") );
-    
-    webServiceURI = uiUtils.createText( wsdlGroup, null, "TOOLTIP_PCON_TEXT_WS", INFOPOP_PCON_TEXT_WSDL, SWT.SINGLE | SWT.BORDER );
-    webServiceURI.addModifyListener(
-      new ModifyListener()
-      {
-        public void modifyText(ModifyEvent event)
-        {
-          handleWebServiceURIModifyEvent();
-        }
-      });
-    webServiceURI.addListener( SWT.Modify, statusListener );
-
-    wsBrowseButton_ = uiUtils.createPushButton( wsdlGroup, "BUTTON_BROWSE", "TOOLTIP_PCON_BUTTON_BROWSE_WS", INFOPOP_PCON_BUTTON_BROWSE_WSDL );
-    wsBrowseButton_.addSelectionListener(
-      new SelectionListener()
-      {
-        public void widgetDefaultSelected(SelectionEvent event)
-        {
-          handleWSDLButton();
-        }
-        
-        public void widgetSelected(SelectionEvent event)
-        {
-          handleWSDLButton();
-        } 
-      });
-
-    tree = new WSDLSelectionTreeWidget();
-    tree.addControls(parent, statusListener);
-    tree.setWebServicesParser(webServicesParser);
-    return this;
-  }
-  
-  private void handleWebServiceURIModifyEvent()
-  {
-    if (webServiceURI.getText().indexOf(':') > 0)
-      Timer.newInstance(Display.getCurrent(), this).startTimer();
-    else
-      handleWebServiceURI();
-    statusListener_.handleEvent(null);
-  }
-  
-  private void handleWebServiceURI()
-  {
-    String wsURI = webServiceURI.getText();
-    if (wsURI.indexOf(':') < 0)
-    {
-      IFile file = uri2IFile(wsURI);
-      if (file != null)
-        wsURI = iFile2URI(file);
-    }
-    if (wsURI != null && wsURI.indexOf(':') >= 0 && webServicesParser.getWebServiceEntityByURI(wsURI) == null)
-    {
-      WSDLSelectionConditionCommand cmd = new WSDLSelectionConditionCommand();
-      cmd.setWebServicesParser(webServicesParser);
-      cmd.setWebServiceURI(wsURI);
-      cmd.execute(null);
-    }
-    WebServiceEntity entity = webServicesParser.getWebServiceEntityByURI(wsURI);
-    if (entity != null && entity.getType() == WebServiceEntity.TYPE_WSDL)
-      tree.setEnabled(false);
-    else
-      tree.setEnabled(true);
-    tree.setWebServiceURI(wsURI);
-    tree.refreshTreeViewer();
-  }
-  
-  public void run()
-  {
-    handleWebServiceURI();
-    statusListener_.handleEvent(null);
-  }
-
-  private void handleWSDLButton()
-  {
-    DialogResourceBrowser dialog = new DialogResourceBrowser( parent_.getShell(), null, wsFilter_);
-    dialog.open();
-    IResource res = dialog.getFirstSelection();
-    if( res != null ) webServiceURI.setText( res.getFullPath().toString() );
-    statusListener_.handleEvent(null);
-  }
-  
-  public Status getStatus()
-  {
-    // Timer validation
-    /*
-     * Commenting out because we don't want to block fast typers from hitting Next/Finish 
-    if (Timer.isRunning())
-      return new SimpleStatus("", msgUtils_.getMessage("PAGE_MSG_LOADING_WEB_SERVICE_URI"), Status.ERROR);
-    */
-
-    // Validate the String representation of the Web service URI
-    // For example, is it pointing to an existing resource in the workspace?
-    String wsPath  = webServiceURI.getText();
-    if( wsPath == null || wsPath.length() <= 0 )
-      return new SimpleStatus("", msgUtils_.getMessage("PAGE_MSG_INVALID_WEB_SERVICE_URI"), Status.ERROR);
-    else if( wsPath.indexOf(':') < 0 )
-    {
-      IResource res = ResourceUtils.findResource(wsPath);
-      if( res == null )
-        return new SimpleStatus("", msgUtils_.getMessage("PAGE_MSG_NO_SUCH_FILE", new Object[] {wsPath}), Status.ERROR);
-      else if( res.getType() != IResource.FILE )
-        return new SimpleStatus("", msgUtils_.getMessage("PAGE_MSG_INVALID_WEB_SERVICE_URI"), Status.ERROR);
-    }
-
-    // Validate the content of the Web service URI
-    // For example, is selection a WSDL URI?
-    if (!Timer.isRunning() && tree.isEnabled())
-    {
-      Status status = tree.getStatus();
-      if (status != null)
-      {
-        int severity = status.getSeverity();
-        if (severity == Status.ERROR || severity == Status.WARNING)
-          return status;
-      }
-    }
-    else
-    {
-      if( wsPath.indexOf(':') < 0 )
-      {
-        String wsdlURI = iFile2URI((IFile)ResourceUtils.findResource(wsPath));
-        if (webServicesParser.getWSDLDefinition(wsdlURI) == null)
-          return new SimpleStatus("", msgUtils_.getMessage("PAGE_MSG_SELECTION_MUST_BE_WSDL"), Status.ERROR);
-      }
-    }
-
-    // OK status
-    return new SimpleStatus( "" );
-  }
-  
-  private IFile uri2IFile(String uri)
-  {
-    IResource res = ResourcesPlugin.getWorkspace().getRoot().findMember(uri);
-    if (res instanceof IFile)
-      return (IFile)res;
-    else
-      return null;
-  }
-  
-  private String iFile2URI(IFile file)
-  {
-  	File f = file.getLocation().toFile();
-    try
-    {
-      return f.toURL().toString();
-    }
-    catch (MalformedURLException murle)
-    {
-    }
-    return f.toString();
-  }
-
-  public void setInitialSelection(IStructuredSelection initialSelection)
-  {
-    if (initialSelection != null && !initialSelection.isEmpty())
-    {
-      Object object = initialSelection.getFirstElement();
-      String wsdlURI = toWsdlURI(object);
-      if (wsdlURI != null)
-      {
-        webServiceURI.setText(wsdlURI);
-        handleWebServiceURI();
-      }
-    }
-  }
-  
-  private String toWsdlURI(Object object)
-  {
-    if (object instanceof ServiceImpl)
-      return J2EEActionAdapterFactory.getWSDLURI((ServiceImpl)object);
-    else if (object instanceof WSDLResourceImpl)
-      return J2EEActionAdapterFactory.getWSDLURI((WSDLResourceImpl)object);
-    else if (object instanceof ServiceRef)
-      return J2EEActionAdapterFactory.getWSDLURI((ServiceRef)object);
-    else if (object instanceof IFile)
-      return ((IFile)object).getFullPath().toString();
-    else if (object instanceof String)
-      return (String)object;
-    else
-      return null;
-  }
-  
-  private String toAbsoluteWsdlURI(Object object)
-  {
-    if (object instanceof IFile)
-    {
-      try
-      {
-        return ((IFile)object).getLocation().toFile().toURL().toString();
-      }
-      catch (MalformedURLException murle)
-      {
-      }
-    }
-    return toWsdlURI(object);
-  }
-
-  public IStructuredSelection getObjectSelection()
-  {
-    return new StructuredSelection( 
-               new WSDLSelectionWrapper( webServicesParser,
-                                         new StructuredSelection(tree.getWsdlURI()) ) );
-  }
-  
-  public WebServicesParser getWebServicesParser()
-  {
-    return webServicesParser;
-  }
-  
-  public Status validateSelection(IStructuredSelection objectSelection)
-  {
-    return new SimpleStatus("");
-  }
-  
-  public IProject getProject()
-  {
-    String wsdlURI = tree.getWsdlURI();
-    if (wsdlURI != null)
-    {
-      IProject p = getProjectFromURI(wsdlURI);
-      if (p!=null && p.exists())
-        return p;
-      
-      String wsRelPath = webServiceURI.getText();
-      IResource wsRes = ResourceUtils.findResource(wsRelPath);
-      if (wsRes!=null && wsRes instanceof IFile)
-      {
-        IProject p2 = ((IFile)wsRes).getProject();
-        return p2;
-      }
-      
-    }
-    return null;
-  }
-  
-  private IProject getProjectFromURI(String uri)
-  {
-    IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-    String wkspcRootLoc = root.getLocation().toString();
-    int idx = uri.indexOf(wkspcRootLoc);
-    if (idx != -1) 
-    {
-      String relPath = uri.substring(wkspcRootLoc.length()+idx);
-      IResource res = root.findMember(new Path(relPath));
-      if (res instanceof IFile)
-      {
-        IProject p = ((IFile)res).getProject();
-        return p;
-      }
-    }
-    return null;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/WSDLSelectionWrapper.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/WSDLSelectionWrapper.java
deleted file mode 100644
index 341ddf8..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/WSDLSelectionWrapper.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.object;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.wst.ws.parser.wsil.WebServicesParser;
-
-/**
- * This class is a very simple wrapper that binds a WSDL parser with
- * a wsdlSelection object.
- */
-public class WSDLSelectionWrapper 
-{
-  public WebServicesParser    parser;
-  public IStructuredSelection wsdlSelection;
-  
-  public WSDLSelectionWrapper( WebServicesParser    parser,
-                               IStructuredSelection selection )
-  {
-    this.parser        = parser;
-    this.wsdlSelection = selection;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/ClientRuntimeSelectionWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/ClientRuntimeSelectionWidget.java
deleted file mode 100644
index 79798e7..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/ClientRuntimeSelectionWidget.java
+++ /dev/null
@@ -1,304 +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.consumption.ui.widgets.runtime;
-
-import org.eclipse.jst.ws.internal.consumption.ui.common.ValidationUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.wizard.ClientProjectTypeRegistry;
-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.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-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.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.command.env.core.selection.SelectionList;
-import org.eclipse.wst.command.env.core.selection.SelectionListChoices;
-import org.eclipse.wst.command.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.env.ui.widgets.WidgetDataEvents;
-
-
-public class ClientRuntimeSelectionWidget extends SimpleWidgetDataContributor
-{
-  private String    pluginId_ = "org.eclipse.jst.ws.consumption.ui";
-  
-  /* CONTEXT_ID PWRS0003 for the Wizard Scenario Client configuration of the Runtime Selection Page */
-  private String INFOPOP_PWRS_GROUP_CLIENT = pluginId_ + ".PWRS0003";
-  
-  private String                       clientScenarioId;
-  private Group                        clientGroup_;
-  private RuntimeServerSelectionWidget runtimeWidget_;
-  private SelectionListChoices         runtime2ClientTypes_;
-  private Combo                        clientType_;
-  private SelectionAdapter             clientTypeSelListener;
-  private ProjectSelectionWidget       projectWidget_;
-  private boolean 					   isVisible_;
-  
-  // rsk revisit - Putting this in temporarily. The RuntimeSelectionDialog needs the server
-  // information even when it is launched for the client half of the configuration.
-  private String                       serviceScenarioId;
-  //
-  
-  
-  public WidgetDataEvents addControls( Composite parent, final Listener statusListener )
-  {
-    MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
-    UIUtils      uiUtils  = new UIUtils(msgUtils, pluginId_ ); 
-    
-    clientGroup_ = uiUtils.createGroup( parent, "LABEL_CLIENT_SELECTION_VIEW_TITLE",
-                                        null, INFOPOP_PWRS_GROUP_CLIENT, 2, 5, 5 );
-    
-    runtimeWidget_ = new RuntimeServerSelectionWidget( true );
-    runtimeWidget_.addControls( clientGroup_, statusListener );
-    runtimeWidget_.addModifyListener( new ModifyListener()
-                                      {
-                                        public void modifyText(ModifyEvent e)
-                                        {
-                                          handleRuntime2ClientTypesEvent();
-                                          handleUpdateProjectWidget();
-                                        }
-                                      });
-    
-    clientType_ = uiUtils.createCombo( clientGroup_, "LABEL_CLIENT_TYPE",  
-                                       "TOOLTIP_PWCR_COMBO_CLIENT_TYPE",
-                                       INFOPOP_PWRS_GROUP_CLIENT, 
-                                       SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
-    
-    clientTypeSelListener = new SelectionAdapter()
-                                {
-                                  public void widgetSelected( SelectionEvent evt )
-                                  {
-                                    handleSetProjects( clientType_.getSelectionIndex() );
-                                    statusListener.handleEvent(null);
-                                  }
-                                };
-                                
-    clientType_.addSelectionListener(clientTypeSelListener);
-    
-    projectWidget_ = new ProjectSelectionWidget(true);
-    projectWidget_.addControls( clientGroup_, statusListener );
-    
-    //projectWidget_.addModifyListener(new ModifyListener(){
-    //  								public void modifyText(ModifyEvent e){
-    //  								  getProjectSelections();
-    //  								}
-    //								});
-    
-    return this;
-  }
-  
-  // This method is called by the creator of this widget to control
-  // whether it is visible or not.
-  public void setVisible( boolean value )
-  {
-    clientGroup_.setVisible( value ); 
-    isVisible_ = value;
-  }
-  
-  public boolean isVisible(){
-  	return this.isVisible_;
-  }
-
-  public void setClientTypeRuntimeServer( TypeRuntimeServer ids )
-  {     
-    runtimeWidget_.setTypeRuntimeServer( ids );
-    projectWidget_.setTypeRuntimeServer(ids);
-  }
-  
-  public TypeRuntimeServer getClientTypeRuntimeServer()
-  {
-    return runtimeWidget_.getTypeRuntimeServer();  
-  }
-  
-  public String getJ2EEVersion()
-  {
-    return runtimeWidget_.getJ2EEVersion();
-  }
-  
-  public void setJ2EEVersion(String j2eeVersion)
-  {
-    runtimeWidget_.setJ2EEVersion(j2eeVersion);
-    projectWidget_.setJ2EEVersion(j2eeVersion);
-  }
-    
-  public boolean getClientNeedEAR()
-  {
-    return projectWidget_.getNeedEAR();
-  }
-  
-  public void setClientNeedEAR(boolean b)
-  {
-    projectWidget_.setNeedEAR(b);
-  }  
-  
-  /**
-   * @param runtime2ClientTypes The runtime2ClientTypes to set.
-   */
-  public void setRuntime2ClientTypes(SelectionListChoices runtime2ClientTypes)
-  {
-    runtime2ClientTypes_ = runtime2ClientTypes;
-    handleRuntime2ClientTypesEvent();
-  }
-
-  public SelectionListChoices getRuntime2ClientTypes()
-  {
-    ClientProjectTypeRegistry registry = ClientProjectTypeRegistry.getInstance();
-    
-    String runtime       = runtimeWidget_.getTypeRuntimeServer().getRuntimeId();
-    String clientProject = projectWidget_.getProjectChoices().getList().getSelection();
-    String earProject    = projectWidget_.getProjectChoices().getChoice().getList().getSelection();
-    
-    SelectionList runtimeList  = runtime2ClientTypes_.getList();
-    runtimeList.setSelectionValue( runtime );
-    
-    SelectionList projTypeList = runtime2ClientTypes_.getChoice().getList();
-    projTypeList.setIndex( clientType_.getSelectionIndex() );
-    
-    SelectionListChoices clientProjChoice = runtime2ClientTypes_.getChoice().getChoice();
-    SelectionList        clientProjList   = clientProjChoice.getList();
-    clientProjList.setSelectionValue( clientProject );    
-    
-    SelectionList        earProjList      = clientProjChoice.getChoice().getList();   
-    earProjList.setSelectionValue( earProject );
-    
-    return runtime2ClientTypes_; 
-  }
-  
-  private void handleRuntime2ClientTypesEvent()
-  {
-    if (runtime2ClientTypes_ != null)
-    {  
-      //If the runtimeId from runtimeWidget_ is already selected in
-      //in runtime2ClientTypes_, do nothing. 
-      String currentRuntimeId = runtime2ClientTypes_.getList().getSelection();
-      String newRuntimeId = runtimeWidget_.getTypeRuntimeServer().getRuntimeId();
-      if (currentRuntimeId != newRuntimeId)
-      {
-        SelectionList runtimes = runtime2ClientTypes_.getList();
-        runtimes.setSelectionValue( runtimeWidget_.getTypeRuntimeServer().getRuntimeId() );
-      }
-      
-      String[] clientTypeIds = runtime2ClientTypes_.getChoice().getList().getList();
-      int selectedClientTypeIdx = runtime2ClientTypes_.getChoice().getList().getIndex();
-      
-      clientType_.removeSelectionListener(clientTypeSelListener);
-      clientType_.setItems( getClientTypeLabels( clientTypeIds ));
-      clientType_.select(selectedClientTypeIdx);
-      clientType_.addSelectionListener(clientTypeSelListener);
-      handleSetProjects(selectedClientTypeIdx);
-      
-    }
-  }
-
-
-  private void handleUpdateProjectWidget()
-  {
-    projectWidget_.setTypeRuntimeServer(runtimeWidget_.getTypeRuntimeServer());
-    projectWidget_.setJ2EEVersion(runtimeWidget_.getJ2EEVersion());
-  }
-
-  
-  private void handleSetProjects( int clientTypeIndex )
-  {    
-    SelectionListChoices clientType2Projects = runtime2ClientTypes_.getChoice();
-    clientType2Projects.getList().setIndex( clientTypeIndex );
-    
-    // Make sure that the project name and EAR name are kept the same
-    // even if the client type is changed.  Note: the project and EAR lists
-    // will be updated according to what is set by the client type.
-    SelectionListChoices currentProjects = projectWidget_.getProjectChoices();
-    
-    if( currentProjects != null )
-    {
-      String projectName = currentProjects.getList().getSelection();
-      String earName     = currentProjects.getChoice().getList().getSelection();
-      
-      // Set the project to it's original state.
-      clientType2Projects.getChoice().getList().setSelectionValue( projectName );
-	
-	  // Set the EAR name to it's original state.
-      clientType2Projects.getChoice().getChoice().getList().setSelectionValue( earName );
-    }
-	
-    projectWidget_.setProjectTypeId(clientType2Projects.getList().getSelection());
-    projectWidget_.setProjectChoices( clientType2Projects.getChoice() );    
-  }
-  
-  private String[] getClientTypeLabels( String[] types )
-  {
-    ClientProjectTypeRegistry registry         = ClientProjectTypeRegistry.getInstance();
-    String[]                  clientTypeLabels = new String[types.length];
-    
-    for( int index = 0; index < types.length; index++ )
-    {
-      clientTypeLabels[index] = registry.getElementById(types[index]).getAttribute("label");
-    }
-    
-    return clientTypeLabels;
-  }
-  
-  public ProjectSelectionWidget getProjectSelectionWidget() {
-    return this.projectWidget_;
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.WidgetContributor#getStatus()
-   */
-  public Status getStatus() 
-  {
-    Status finalStatus   = new SimpleStatus( "" );
-    Status projectStatus = projectWidget_.getStatus();
-    Status runtimeStatus = runtimeWidget_.getStatus();
-    
-    if( runtimeStatus.getSeverity() == Status.ERROR )
-    {
-      finalStatus = runtimeStatus;
-    }
-    else if( projectStatus.getSeverity() == Status.ERROR )
-    {
-      finalStatus = projectStatus;
-    }
-    else
-    {
-      SelectionListChoices clientProjects = getProjectSelectionWidget().getProjectChoices();
-      ValidationUtils valUtils = new ValidationUtils();
-      if (clientProjects != null)
-      {
-        String clientEARName = clientProjects.getChoice().getList().getSelection();
-        String clientProjName = clientProjects.getList().getSelection();
-
-        //Validate that the selected client project is of the type indicated by client project type.
-        Status clientProjectTypeStatus = valUtils.validateProjectType(clientProjName, runtime2ClientTypes_);
-        if (clientProjectTypeStatus.getSeverity() == Status.ERROR)
-        {
-          finalStatus = clientProjectTypeStatus;
-        }
-        
-        //Validate client side server targets and J2EE levels
-        String clientServerFactoryId = getClientTypeRuntimeServer().getServerId();
-        String clientJ2EElevel = getJ2EEVersion();
-        Status clientProjectStatus = valUtils.validateProjectTargetAndJ2EE(clientProjName, clientEARName, clientServerFactoryId,
-            clientJ2EElevel);
-        if (clientProjectStatus.getSeverity() == Status.ERROR)
-        {
-          finalStatus = clientProjectStatus;
-        }
-      }
-    }
-    return finalStatus;    
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/ClientRuntimeSelectionWidgetDefaultingCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/ClientRuntimeSelectionWidgetDefaultingCommand.java
deleted file mode 100644
index 96d80a3..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/ClientRuntimeSelectionWidgetDefaultingCommand.java
+++ /dev/null
@@ -1,822 +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.consumption.ui.widgets.runtime;
-
-import java.util.StringTokenizer;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.internal.earcreation.EARNatureRuntime;
-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.common.StringToIProjectTransformer;
-import org.eclipse.jst.ws.internal.consumption.ui.common.ClientServerSelectionUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.common.ServerSelectionUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.common.ValidationUtils;
-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.wizard.ClientProjectTypeRegistry;
-import org.eclipse.jst.ws.internal.consumption.ui.wizard.IWebServiceRuntime;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.jst.ws.internal.wsrt.WebServiceRuntimeExtensionUtils;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.command.env.core.selection.SelectionList;
-import org.eclipse.wst.command.env.core.selection.SelectionListChoices;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerUtil;
-import org.eclipse.wst.ws.parser.wsil.WebServicesParser;
-
-public class ClientRuntimeSelectionWidgetDefaultingCommand extends SimpleCommand
-{   
-  protected MessageUtils msgUtils_;
-  // clientRuntimeJ2EEType contains the default client runtime and J2EE level based on the initial selection.
-  // If the initialSeleciton does not result in a valid client runtime and J2EE level, clientRuntimeJ2EEType
-  // should remain null for the life of this instance.  
-  private WSRuntimeJ2EEType    clientRuntimeJ2EEType_;
-  
-  private TypeRuntimeServer    clientIds_;
-  private SelectionListChoices runtimeClientTypes_;
-  
-  //A note on initialSelections ...
-  //The difference between clientInitialSelection_ and initialInitialSelection is that
-  //clientInitialSelection_ comes from the ObjectSelectionOutputCommand while initialInitialSelection
-  //is the actual thing that was selected before the wizard was launched. In the runtime/j2ee/project 
-  //defaulting algorithm, clientInitialSelection will be given first priority. If, however, it is 
-  //deemed that clientInitialProject is not a valid initial selection, initialInitialSelection
-  //will be given second priority. Things that could make an initialSelection invalid include
-  //1. The containing project contains the Web service for which we are trying to create a client
-  //2. The containing project has a J2EE level, server target, and project type combination which
-  //   is not supported by any of the registered Web service runtimes.
-  private IStructuredSelection clientInitialSelection_;
-  private IProject clientInitialProject_;
-  private IStructuredSelection initialInitialSelection_;
-  private IProject initialInitialProject_;
-
-  private String clientJ2EEVersion_;
-  protected boolean clientNeedEAR_ = true;
-  
-  private String wsdlURI_;
-  private WebServicesParser parser_;
-
-
-  public ClientRuntimeSelectionWidgetDefaultingCommand()
-  {
-    super();
-    String  pluginId = "org.eclipse.jst.ws.consumption.ui";
-    msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
-  }
-  
-  public void setClientTypeRuntimeServer( TypeRuntimeServer ids )
-  {
-    clientIds_ = ids;
-  }
-  
-  public TypeRuntimeServer getClientTypeRuntimeServer()
-  {
-    return clientIds_; 
-  }
-  
-  public SelectionListChoices getRuntime2ClientTypes()
-  {
-    return runtimeClientTypes_;
-  }
-  
-  public String getClientJ2EEVersion()
-  {
-    return clientJ2EEVersion_;
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.core.Command#execute(org.eclipse.wst.command.env.core.common.Environment)
-   */
-  public Status execute(Environment environment)
-  {
-    try
-    {
-	  // rskreg		
-      //WebServiceClientTypeRegistry reg = WebServiceClientTypeRegistry.getInstance();
-
-      //String[] runtimeIds = gatherAttributeValues(reg.getConfigurationElement(clientIds_.getTypeId()), "runtime");
-	  String[] runtimeIds = WebServiceRuntimeExtensionUtils.getRuntimesByClientType(clientIds_.getTypeId()); 
-	  // rskreg
-      SelectionList list = new SelectionList(runtimeIds, 0);
-      Vector choices = new Vector();
-      for (int i = 0; i < runtimeIds.length; i++) {
-        choices.add(getClientTypesChoice(runtimeIds[i]));
-      }
-      runtimeClientTypes_ = new SelectionListChoices(list, choices);
-      //setClientDefaultRuntimeFromPreference();
-      //setClientDefaultJ2EEVersionFromPreference();
-      //clientRuntimeJ2EEType_ = getClientRuntimeAndJ2EEFromProject(clientInitialProject_);
-      //if (clientRuntimeJ2EEType_ != null)
-      //{
-        //clientJ2EEVersion_ = clientRuntimeJ2EEType_.getJ2eeVersionId();
-        //setClientRuntimeId(clientRuntimeJ2EEType_.getWsrId());
-        //setClientProjectType(clientRuntimeJ2EEType_.getClientProjectTypeId());
-      //}
-	  setClientRuntimeId((WebServiceRuntimeExtensionUtils.getRuntimesByClientType(clientIds_.getTypeId()))[0]);
-	  clientJ2EEVersion_ = (WebServiceRuntimeExtensionUtils.getWebServiceRuntimeById(clientIds_.getRuntimeId()).getJ2eeLevels())[0];
-	  
-      //If clientInitialProject is the service project, check the initialInitialProject
-      //to see if it is valid.
-	  /*
-      ValidationUtils vu = new ValidationUtils();
-      if (vu.isProjectServiceProject(clientInitialProject_, wsdlURI_, parser_))
-      {            
-        clientRuntimeJ2EEType_ = getClientRuntimeAndJ2EEFromProject(initialInitialProject_);
-        if (clientRuntimeJ2EEType_ != null)
-        {
-          clientJ2EEVersion_ = clientRuntimeJ2EEType_.getJ2eeVersionId();
-          setClientRuntimeId(clientRuntimeJ2EEType_.getWsrId());
-          setClientProjectType(clientRuntimeJ2EEType_.getClientProjectTypeId());
-          //Since the original clientIntialProject was invalid but initialInitialProject is valid,
-          //reset clientInitalProject_ to be initialInitialProject for the benefit of
-          //downstream project defaulting.
-          clientInitialProject_ = initialInitialProject_;
-        }
-      }
-      */
-      //setClientDefaultProject();
-      //setClientDefaultEAR();
-      //setClientDefaultServer();
-	  clientIds_.setServerId((WebServiceRuntimeExtensionUtils.getWebServiceRuntimeById(clientIds_.getRuntimeId()).getServerFactoryIds())[0]);
-      updateClientEARs();
-      return new SimpleStatus("");
-    } catch (Exception e)
-    {
-      //Catch all Exceptions in order to give some feedback to the user
-      Status errorStatus = new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_TASK_EXCEPTED",new String[]{e.getMessage()}),Status.ERROR, e);
-      environment.getStatusHandler().reportError(errorStatus);
-      return errorStatus;
-    }
-    
-  }
-  
-
-  /**
-   * 
-   * @param runtimeId
-   * @return
-   */
-  private SelectionListChoices getClientTypesChoice(String runtimeId)
-  {
-    //WebServiceClientTypeRegistry reg = WebServiceClientTypeRegistry.getInstance();
-    ClientProjectTypeRegistry cptr = ClientProjectTypeRegistry.getInstance();
-    String[] clientTypes;
-	// rskreg
-    //String[] clientProjectTypes = gatherAttributeValues(reg.getConfigurationElement(clientIds_.getTypeId(), runtimeId), "clientProjectType");
-	clientTypes = WebServiceRuntimeExtensionUtils.getClientProjectTypes(clientIds_.getTypeId(), runtimeId);
-	/*
-    if (clientProjectTypes!=null && clientProjectTypes.length > 0)
-    {
-      StringTokenizer st = new StringTokenizer(clientProjectTypes[0]);
-      clientTypes = new String[st.countTokens()];
-      for (int i = 0; i < clientTypes.length; i++)
-        clientTypes[i] = st.nextToken();
-    }
-    else
-      clientTypes = new String[] {cptr.getDefaultElement().getAttribute("id")};
-    */
-    // rskreg
-	// Seng's Note: Check flexible project structure non-support here!!!
-    SelectionList list = new SelectionList(clientTypes, 0);
-    Vector choices = new Vector();
-    for (int i = 0; i < clientTypes.length; i++) {
-      choices.add(getProjectChoice(clientTypes[i]));
-    }
-    return new SelectionListChoices(list, choices);
-  }
-    
-  /**
-   * 
-   * @param clientType
-   * @return
-   * 
-   */
-  private SelectionListChoices getProjectChoice(String clientType)
-  {
-    IProject[] projects = ClientProjectTypeRegistry.getInstance().getProjects(clientType);
-    String[] projectNames = new String[projects.length];
-    for (int i = 0; i < projects.length; i++)
-      projectNames[i] = projects[i].getName();
-    SelectionList list = new SelectionList(projectNames, 0);
-    Vector choices = new Vector();
-    for (int i = 0; i < projects.length; i++)
-      choices.add(getProjectEARChoice(projects[i]));
-    return new SelectionListChoices(list, choices, getEARProjects());
-  }
-  
-/**
- * 
- * @param project
- * @return
- */
-  protected SelectionListChoices getProjectEARChoice(IProject project)
-  {
-    Vector v = new Vector();
-	// TODO used to be J2EEUtils.getEARProjects(project) -- referenced EARs
-    IProject[] earNatures = J2EEUtils.getEARProjects();
-    if (earNatures != null){
-      for(int i = 0; i < earNatures.length; i++){
-        v.add(earNatures[i].getName());
-      }
-    }
-    IProject[] earProjects = J2EEUtils.getEARProjects();
-    if (earProjects != null)
-    {
-    	for (int i = 0; i < earProjects.length; i++)
-    	{
-    	  String earProjectName = earProjects[i].getName();
-    	  if (!v.contains(earProjectName))
-    	  	v.add(earProjectName);
-    	}
-    }
-    SelectionList list = new SelectionList((String[])v.toArray(new String[0]), 0);
-    return new SelectionListChoices(list, null);
-  }
-  
-  protected SelectionList getEARProjects()
-  {
-    IProject[] earProjects = J2EEUtils.getEARProjects();
-    String[] earProjectNames = new String[earProjects.length];
-    for (int i=0; i<earProjects.length; i++)
-    {
-      earProjectNames[i] = earProjects[i].getName();
-    }
-    return new SelectionList(earProjectNames, 0);
-  }
-
-  // rskreg
-  /*
-  private String[] gatherAttributeValues(IConfigurationElement[] elements, String key)
-  {
-    Vector v = new Vector();
-    for (int i = 0; i < elements.length; i++)
-    {
-      String value = elements[i].getAttribute(key);
-      if (value != null && value.length() > 0)
-      {
-        if (!v.contains(value))
-          v.add(value);
-      }
-    }
-    return (String [])v.toArray(new String[0]);
-  }
-  */
-  // rskreg
-  
-  // rskreg
-  /*
-  private void setClientDefaultRuntimeFromPreference()
-  {
-    PersistentServerRuntimeContext context = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext();
-    String pRuntimeId = context.getRuntimeId();
-
-    //set the client runtime to be the preferred runtime if the client type allows.
-    setClientRuntimeId(pRuntimeId);
-  }
-  */
-  // rskreg
-  
-  private void setClientRuntimeId(String id)
-  {
-    String[] clientRuntimeIds = getRuntime2ClientTypes().getList().getList();
-    for (int i=0; i<clientRuntimeIds.length;i++)
-    {
-    	if(clientRuntimeIds[i].equals(id))
-    	{
-    	  getClientTypeRuntimeServer().setRuntimeId(id);
-		  getRuntime2ClientTypes().getList().setIndex(i);
-		  break;
-   	    }
-    }    
-  }
-  
-  private void setClientProjectType(String id)
-  {
-    String[] clientProjectTypeIds = getRuntime2ClientTypes().getChoice().getList().getList();
-    for (int i=0; i<clientProjectTypeIds.length;i++)
-    {
-    	if(clientProjectTypeIds[i].equals(id))
-    	{
-    	  getRuntime2ClientTypes().getChoice().getList().setIndex(i);
-		  break;
-   	    }
-    }        
-  }
-  
-  // rskreg
-  /*
-  protected void setClientDefaultJ2EEVersionFromPreference()
-  {
-    if (clientIds_ != null)
-    {
-      String runtimeId = clientIds_.getRuntimeId();
-      if (runtimeId != null)
-      {
-        IWebServiceRuntime wsr = WebServiceServerRuntimeTypeRegistry.getInstance().getWebServiceRuntimeById(runtimeId);
-        if (wsr != null)
-        {
-          String[] versions = wsr.getJ2EEVersions();
-          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))
-          		{
-          	      clientJ2EEVersion_ = versions[i];
-          		  return;
-          		}
-          	  }
-          	}
-          	clientJ2EEVersion_ = versions[0];
-          	return;          	
-          }
-        }
-      }
-    }  	
-  }
-  */
-  // rskreg
-  // rskreg
-  /*
-  private WSRuntimeJ2EEType getClientRuntimeAndJ2EEFromProject(IProject project)
-  {
-    WSRuntimeJ2EEType cRJ2EE = 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())
-    {
-      if (ResourceUtils.isWebProject(project) || ResourceUtils.isEJBProject(project) || ResourceUtils.isAppClientProject(project) || ResourceUtils.isTrueJavaProject(project))
-      {
-        WebServiceClientTypeRegistry wsctReg = WebServiceClientTypeRegistry.getInstance();
-        
-        //Get the J2EE level
-        String versionString = null;
-        if (!ResourceUtils.isTrueJavaProject(project))
-        {
-	      int versionId = J2EEUtils.getJ2EEVersion(project);        
-	      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();
-        
-        //Get the client project type
-        String clientProjectTypeId = getClientProjectTypeFromRuntimeId(project, clientIds_.getRuntimeId());
-        
-        //If the preferred runtime supports this J2EE level and server target, keep it
-        if ((versionString == null || wsctReg.doesRuntimeSupportJ2EELevel(versionString, clientIds_.getRuntimeId())) &&
-            ((runtimeTarget == null) ||
-             ((runtimeTarget != null) && wsctReg.doesRuntimeSupportServerTarget(runtimeTargetId, clientIds_.getRuntimeId()))) &&
-             (clientProjectTypeId != null)
-           )
-        {
-          //Set the J2EE level and web service runtime to match the project
-          cRJ2EE = new WSRuntimeJ2EEType();
-          cRJ2EE.setJ2eeVersionId(versionString);
-          cRJ2EE.setWsrId(clientIds_.getRuntimeId());
-          cRJ2EE.setClientProjectTypeId(clientProjectTypeId);
-          return cRJ2EE;
-        } else
-        {
-          //Look for a runtime that matches
-          String[] validRuntimes = wsctReg.getRuntimesByType(clientIds_.getTypeId());
-          for (int i = 0; i < validRuntimes.length; i++)
-          {
-            String thisClientProjectTypeId = getClientProjectTypeFromRuntimeId(project, validRuntimes[i]); 
-            if ((versionString == null || wsctReg.doesRuntimeSupportJ2EELevel(versionString, validRuntimes[i])) &&
-                ((runtimeTarget == null) ||
-                 ((runtimeTarget != null) && wsctReg.doesRuntimeSupportServerTarget(runtimeTargetId, validRuntimes[i]))) &&
-                 (thisClientProjectTypeId != null)
-                )
-            {
-              cRJ2EE = new WSRuntimeJ2EEType();
-              cRJ2EE.setJ2eeVersionId(versionString);
-              cRJ2EE.setWsrId(validRuntimes[i]);
-              cRJ2EE.setClientProjectTypeId(thisClientProjectTypeId);
-              return cRJ2EE;
-            }
-          }
-        }
-      }
-    }    
-    return cRJ2EE;
-  }
-  */
-  // rskreg
-  // rskreg
-  /*
-  private void setClientDefaultProject()
-  {    
-	//Handle the case where no valid initial selection exists
-    if (clientInitialProject_ == null || (clientInitialProject_!=null && clientRuntimeJ2EEType_==null))
-    {
-      //Select the first existing project that is valid.
-      setClientProjectToFirstValid();
-      return;
-    }    
-
-    ValidationUtils vu = new ValidationUtils();
-    if (!vu.isProjectServiceProject(clientInitialProject_, wsdlURI_, parser_))
-    {
-      getRuntime2ClientTypes().getChoice().getChoice().getList().setSelectionValue(clientInitialProject_.getName());
-    }
-    else
-    {
-      setClientProjectToFirstValid();
-    }
-
-  }
-  */
-  /*
-  private void setClientProjectToFirstValid()
-  {
-    WebServiceClientTypeRegistry wsctReg = WebServiceClientTypeRegistry.getInstance();
-    ValidationUtils vu = new ValidationUtils();
-    String[] projectNames = getRuntime2ClientTypes().getChoice().getChoice().getList().getList();
-    for (int i=0;i<projectNames.length; i++)
-    {
-      IProject project = (IProject)((new StringToIProjectTransformer().transform(projectNames[i])));
-      if (project.isOpen() && (ResourceUtils.isWebProject(project) || ResourceUtils.isEJBProject(project) || ResourceUtils.isAppClientProject(project)))
-      {
-        //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 (clientJ2EEVersion_ != null && clientJ2EEVersion_.length()>0 && clientJ2EEVersion_.equals(versionString))
-        {
-          if (wsctReg.doesRuntimeSupportJ2EELevel(versionString, clientIds_.getRuntimeId()) &&
-             ((runtimeTarget == null) || 
-             ((runtimeTarget!=null) && wsctReg.doesRuntimeSupportServerTarget(runtimeTargetId, clientIds_.getRuntimeId()))) 
-             )
-          {
-            if (!vu.isProjectServiceProject(project, wsdlURI_, parser_))
-            {        	
-              getRuntime2ClientTypes().getChoice().getChoice().getList().setSelectionValue(projectNames[i]);
-              return;
-            }
-          }
-        }
-      }
-    }
-    
-    //No valid project was found. Enter a new project name.
-    getRuntime2ClientTypes().getChoice().getChoice().getList().setSelectionValue(ResourceUtils.getDefaultWebProjectName());
-  }
-  */
-  // rskreg
-  
-  protected IResource getResourceFromInitialSelection(IStructuredSelection selection)
-  {
-    if (selection != null && selection.size() == 1)
-    {
-      Object obj = selection.getFirstElement();
-      if (obj != null) 
-      {
-        try
-        { 
-          IResource resource = ResourceUtils.getResourceFromSelection(obj);
-          return resource;
-        } catch(CoreException e)
-        {
-          return null;
-        }        
-      }
-    }
-    return null;
-  }
-  
-  private void setClientDefaultEAR()
-  {
-  	//Client-side
-    String initialClientProjectName = getRuntime2ClientTypes().getChoice().getChoice().getList().getSelection(); 
-    IProject initialClientProject = (IProject)((new StringToIProjectTransformer()).transform(initialClientProjectName));  	
-  	IProject defaultClientEAR = getDefaultEARFromClientProject(initialClientProject);
-  	getRuntime2ClientTypes().getChoice().getChoice().getChoice().getList().setSelectionValue(defaultClientEAR.getName());
-  }
-  
-  /**
-   * 
-   * @param project
-   * @return
-   * 
-   * @deprecated Needs to be re-written to deal with flexible project structure APIs 
-   */
-  protected IProject getDefaultEARFromClientProject(IProject project)
-  {
-    if (project!=null && project.exists()) 
-    {
-      IServer[] configuredServers = ServerUtil.getServersByModule(ResourceUtils.getModule(project), null);
-      IServer firstSupportedServer = ClientServerSelectionUtils.getFirstSupportedServer(configuredServers, clientIds_.getTypeId() );
-      
-      EARNatureRuntime[] earProjects = J2EEUtils.getEARProjects(project, firstSupportedServer);
-      if (earProjects!=null && earProjects[0] instanceof EARNatureRuntime) 
-        return earProjects[0].getProject();
-    }
-    
-    int versionId = -1;
-    if (clientJ2EEVersion_ != null && clientJ2EEVersion_.length()>0)
-    {
-      versionId = Integer.parseInt(clientJ2EEVersion_);
-    }
-    EARNatureRuntime newEAR = J2EEUtils.getEAR(versionId);
-
-    IProject earProject = ResourceUtils.getWorkspaceRoot().getProject(ResourceUtils.getDefaultClientEARProjectName());
-      
-    if (newEAR!=null)
-      earProject = newEAR.getProject();
-
-    return earProject;  	
-  }
-  
-  private void setClientDefaultServer()
-  {
-    //Calculate reasonable default server based on initial project selection. 
-    String initialClientProjectName = runtimeClientTypes_.getChoice().getChoice().getList().getSelection(); 
-    IProject initialClientProject = (IProject)((new StringToIProjectTransformer()).transform(initialClientProjectName));
-    if (initialClientProject.exists())
-    {
-      String[] serverInfo = ClientServerSelectionUtils.getServerInfoFromExistingProject(initialClientProject, clientIds_.getTypeId(), clientIds_.getRuntimeId(), true);
-      if (serverInfo!=null)
-      {
-        if (serverInfo[0]!=null && serverInfo[0].length()>0)
-        {
-          clientIds_.setServerId(serverInfo[0]);
-        }
-        if (serverInfo[1]!=null && serverInfo[1].length()>0)
-        {
-          clientIds_.setServerInstanceId(serverInfo[1]);
-        }        
-      }      
-    }
-    else //the project does not exist.
-    {
-      //Does the EAR exist?
-      String initialClientEARProjectName = runtimeClientTypes_.getChoice().getChoice().getChoice().getList().getSelection();
-      IProject initialClientEARProject = (IProject)((new StringToIProjectTransformer()).transform(initialClientEARProjectName));
-      if (initialClientEARProject.exists())
-      {
-        String[] serverInfo = ClientServerSelectionUtils.getServerInfoFromExistingProject(initialClientEARProject, clientIds_.getTypeId(), clientIds_.getRuntimeId(), false);
-        if (serverInfo!=null)
-        {
-          if (serverInfo[0]!=null && serverInfo[0].length()>0)
-          {
-            clientIds_.setServerId(serverInfo[0]);
-          }
-          if (serverInfo[1]!=null && serverInfo[1].length()>0)
-          {
-            clientIds_.setServerInstanceId(serverInfo[1]);
-          }        
-        }              
-      }
-      else
-      {
-        String[] serverInfo = ClientServerSelectionUtils.getServerFromClientRuntimeAndJ2EE(clientIds_.getRuntimeId(), clientJ2EEVersion_);
-        if (serverInfo!=null)
-        {
-          if (serverInfo[0]!=null && serverInfo[0].length()>0)
-          {
-            clientIds_.setServerId(serverInfo[0]);
-          }
-          if (serverInfo[1]!=null && serverInfo[1].length()>0)
-          {
-            clientIds_.setServerInstanceId(serverInfo[1]);
-          }        
-        }        
-      }
-      
-    }        
-  }  
-
-  
-  protected void updateClientEARs()
-  {
-  	//Set EAR selection to null if the project/server defaults imply an EAR should not be created
-    String clientProjectName = getRuntime2ClientTypes().getChoice().getChoice().getList().getSelection();
-  	IProject clientProject = (IProject)((new StringToIProjectTransformer()).transform(clientProjectName));
-  	if (clientProject != null && clientProject.exists())
-  	{
-  	  //Get the runtime target on the serviceProject
-  	  IRuntime clientTarget = ClientServerSelectionUtils.getRuntimeTarget(clientProjectName);
-  	  String j2eeVersion = String.valueOf(J2EEUtils.getJ2EEVersion(clientProject));
-  	  if (clientTarget != null)
-  	  {
-  	  	if (!ServerUtils.isTargetValidForEAR(clientTarget.getRuntimeType().getId(),j2eeVersion))
-  	  	{
-  	      //Default the EAR selection to be empty
-  	  	  getRuntime2ClientTypes().getChoice().getChoice().getChoice().getList().setIndex(-1);
-  	  	  clientNeedEAR_ = false;
-  	  	}  	  		
-  	  }
-  	  
-  	}
-  	else
-  	{
-  		//Use the server type
-  		String clientServerTargetId = ServerUtils.getRuntimeTargetIdFromFactoryId(clientIds_.getServerId());
-  		if (clientServerTargetId!=null && clientServerTargetId.length()>0)
-  		{
-  		  if (!ServerUtils.isTargetValidForEAR(clientServerTargetId,clientJ2EEVersion_))
-  	  	  {
-  	        //Default the EAR selection to be empty
-  	  	    getRuntime2ClientTypes().getChoice().getChoice().getChoice().getList().setIndex(-1);
-  	  	    clientNeedEAR_ = false;
-  	  	  }
-  		}
-  	}  	
-  }  
-  
-  public void setClientInitialSelection(IStructuredSelection selection)
-  {
-    clientInitialSelection_ = selection;
-    if (clientInitialProject_ == null)
-    {
-      clientInitialProject_ = getProjectFromInitialSelection(selection);
-    }
-  }
-
-  public void setClientInitialProject(IProject clientInitialProject)
-  {
-    clientInitialProject_ = clientInitialProject;
-  }
-  
-  /**
-   * @param initialInitialSelection_ The initialInitialSelection_ to set.
-   */
-  public void setInitialInitialSelection(IStructuredSelection initialInitialSelection)
-  {
-    initialInitialSelection_ = initialInitialSelection;
-    initialInitialProject_ = getProjectFromInitialSelection(initialInitialSelection);
-  }
-  
-  public boolean getClientNeedEAR()
-  {
-    return clientNeedEAR_;
-  }
-
-  /**
-   * @param parser_ The parser_ to set.
-   */
-  public void setWebServicesParser(WebServicesParser parser) {
-  	parser_ = parser;
-  }
-  
-  public void setWsdlURI(String wsdlURI)
-  {
-    wsdlURI_ = wsdlURI;
-  }
-  
-  private IProject getProjectFromInitialSelection(IStructuredSelection selection)
-  {
-    if (selection != null && selection.size() == 1)
-    {
-      Object obj = selection.getFirstElement();
-      if (obj != null) 
-      {
-        try
-        { 
-          IResource resource = ResourceUtils.getResourceFromSelection(obj);
-          if (resource==null) 
-            return null;
-          IProject p = ResourceUtils.getProjectOf(resource.getFullPath());
-          return p;
-        } catch(CoreException e)
-        {
-          return null;
-        }        
-      }
-    }
-    return null;
-  }
-  
-  private String getClientProjectTypeFromRuntimeId(IProject p, String runtimeId)
-  {
-    //Navigate the runtimeClientTypes to see if we can navigate from the provided
-    //runtime to the provided project's name.
-    String pName = p.getName();
-    String[] runtimeIds = getRuntime2ClientTypes().getList().getList();
-    int numberOfRuntimes = runtimeIds.length;
-    //Get the index of the runtimeId we are interested in
-    for (int i=0; i<numberOfRuntimes; i++)
-    {
-      if (runtimeIds[i].equals(runtimeId))
-      {
-        //Get the list of client project types for this runtimeId
-        SelectionListChoices clientProjectTypesToProjects= getRuntime2ClientTypes().getChoice(i);
-        String[] clientProjectTypes = clientProjectTypesToProjects.getList().getList();
-        for (int j=0; j<clientProjectTypes.length; j++)
-        {
-          //Get the list of projects for this clientProjectType. If pName
-          //is in this list, we know the runtimeId supports this project
-          //and we know the client project type.
-          String[] clientProjects = clientProjectTypesToProjects.getChoice(j).getList().getList();
-          for (int k=0; k<clientProjects.length; k++)
-          {
-            if (clientProjects[k].equals(pName))
-            {
-              //Found the project!!
-              return clientProjectTypes[j];
-            }
-          }
-        }
-        
-      }
-    }
-
-    //We didn't find the project under any of this runtimes client project types.
-    //This means that this runtime does not support that client type. Return null
-    return null;
-  }
-  /**
-   * This inner class is being used to pass around Web service runtime
-   * and J2EE level information.
-   * 
-   */
-  protected class WSRuntimeJ2EEType
-  {
-    private String wsrId_;
-    private String j2eeVersionId_;
-    private String clientProjectTypeId; //only used for client-side defaulting
-    
-    public WSRuntimeJ2EEType()
-    {
-     //making this ctor public so that subclasses can instantiate. 
-    }    
-    /**
-     * @return Returns the j2eeVersionId_.
-     */
-    public String getJ2eeVersionId()
-    {
-      return j2eeVersionId_;
-    }
-    /**
-     * @param versionId_ The j2eeVersionId_ to set.
-     */
-    public void setJ2eeVersionId(String versionId_)
-    {
-      j2eeVersionId_ = versionId_;
-    }
-    /**
-     * @return Returns the wsrId_.
-     */
-    public String getWsrId()
-    {
-      return wsrId_;
-    }
-    /**
-     * @param wsrId_ The wsrId_ to set.
-     */
-    public void setWsrId(String wsrId_)
-    {
-      this.wsrId_ = wsrId_;
-    }    
-    
-    /**
-     * @return Returns the clientProjectTypeId.
-     */
-    public String getClientProjectTypeId()
-    {
-      return clientProjectTypeId;
-    }
-    /**
-     * @param clientProjectTypeId The clientProjectTypeId to set.
-     */
-    public void setClientProjectTypeId(String clientProjectTypeId)
-    {
-      this.clientProjectTypeId = clientProjectTypeId;
-    }
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/ProjectSelectionWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/ProjectSelectionWidget.java
deleted file mode 100644
index 3003619..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/ProjectSelectionWidget.java
+++ /dev/null
@@ -1,342 +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.consumption.ui.widgets.runtime;
-
-import org.eclipse.core.resources.IProject;
-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.common.StringToIProjectTransformer;
-import org.eclipse.jst.ws.internal.consumption.ui.common.ServerSelectionUtils;
-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.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.command.env.common.FileResourceUtils;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.command.env.core.selection.SelectionList;
-import org.eclipse.wst.command.env.core.selection.SelectionListChoices;
-import org.eclipse.wst.command.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.server.core.IRuntime;
-
-public class ProjectSelectionWidget extends SimpleWidgetDataContributor {
-
-  private final String EAR_PERMITTED_PROJECT_TYPE = "EAR_PERMITTED_PROJECT_TYPE";
-  private final String JAVA_PROJECT_TYPE_ID = "org.eclipse.jst.ws.consumption.ui.clientProjectType.Containerless";
-  
-  private String pluginId_ = "org.eclipse.jst.ws.consumption.ui";
-
-  private SelectionListChoices projects_;
-  
-  private boolean needEAR_;
-  
-  private TypeRuntimeServer trsIds_;
-  
-  private String j2eeVersion_;
-  
-  private String projectTypeId_ = EAR_PERMITTED_PROJECT_TYPE;
-
-  private ModifyListener projectListener_;
-
-  private Listener statusListener_;
-
-  private Text messageText_;
-
-  private boolean isClient_ = false;
-
-  private MessageUtils msgUtils;
-
-  private byte CREATE_PROJECT = (byte) 1;
-
-  private byte CREATE_EAR = (byte) 2;
-
-  private byte ADD_EAR_ASSOCIATION = (byte) 4;
-
-  /*
-   * CONTEXT_ID PWRS0006 for the service-side Web project combo box of the
-   * runtime selection Page
-   */
-  private String INFOPOP_PWRS_COMBO_PROJECT = pluginId_ + ".PWRS0006";
-
-  private Combo project_;
-
-  /* CONTEXT_ID PWRS0012 for the EAR combo box of the runtime selection Page */
-  private String INFOPOP_PWRS_COMBO_EAR = pluginId_ + ".PWRS0012";
-
-  private Combo ear_;
-
-  /*
-   * Default Constructor
-   */
-  public ProjectSelectionWidget() {
-  }
-
-  /*
-   * ProjectSelectionWidget @param isClient
-   */
-  public ProjectSelectionWidget(boolean isClient) {
-    this.isClient_ = isClient;
-  }
-
-  public WidgetDataEvents addControls(Composite parent, Listener statusListener) {
-    msgUtils = new MessageUtils(pluginId_ + ".plugin", this);
-    UIUtils uiUtils = new UIUtils(msgUtils, pluginId_);
-
-    statusListener_ = statusListener;
-    // project
-    projectListener_ = new ModifyListener() {
-
-      public void modifyText(ModifyEvent evt) {
-        handleSetEarProjects();
-        //        handleSetMessageText();
-      }
-    };
-    
-    if (isClient_){
-      project_ = uiUtils.createCombo(parent, "LABEL_CLIENT_PROJECT", "TOOLTIP_PWRS_COMBO_PROJECT", INFOPOP_PWRS_COMBO_PROJECT, SWT.SINGLE | SWT.BORDER);
-    }
-    else {
-      project_ = uiUtils.createCombo(parent, "LABEL_SERVICE_WEB_MODULE", "TOOLTIP_PWRS_COMBO_PROJECT", INFOPOP_PWRS_COMBO_PROJECT, SWT.SINGLE | SWT.BORDER);
-    }
-    project_.addModifyListener(projectListener_);
-
-    ear_ = uiUtils.createCombo(parent, "LABEL_SERVICE_EAR_PROJECT", "TOOLTIP_PWRS_COMBO_PROJECT", INFOPOP_PWRS_COMBO_EAR, SWT.SINGLE | SWT.BORDER);
-    //ear_.addModifyListener(earListener_);
-    ear_.addListener(SWT.Modify, statusListener);
-    // message area
-    messageText_ = uiUtils.createText(parent, "LABEL_NO_LABEL", "LABEL_NO_LABEL", null, SWT.WRAP | SWT.MULTI | SWT.READ_ONLY);
-    return this;
-  }
-
-  public void setProjectChoices(SelectionListChoices projects) {
-    projects_ = projects;
-    SelectionList projectList = projects_.getList();
-    // We remove listener here so that modifications to the Combo will
-    // NOT trigger a
-    // modifcation event.
-    project_.removeModifyListener(projectListener_);
-    project_.removeListener(SWT.Modify, statusListener_);
-    project_.setItems(projectList.getList());
-    project_.setText(projectList.getSelection());
-    project_.addModifyListener(projectListener_);
-    project_.addListener(SWT.Modify, statusListener_);
-
-    handleSetEarProjects();
-
-  }
-
-  public SelectionListChoices getProjectChoices() {
-    if (projects_ != null) {
-      SelectionList projectList = projects_.getList();
-      projectList.setSelectionValue(project_.getText());
-      SelectionListChoices ears = projects_.getChoice();
-      if (ears != null) ears.getList().setSelectionValue(ear_.getText());
-    }
-    return projects_;
-  }
-  
-  public boolean getNeedEAR()
-  {
-    return needEAR_;
-  }
-  
-  public void setNeedEAR(boolean b)
-  {
-    needEAR_ = b;
-  }    
-
-  
-  public void setTypeRuntimeServer(TypeRuntimeServer trs)
-  {
-    trsIds_ = trs;
-    updateEAREnabledState();
-    
-  }
-  
-  public void setJ2EEVersion(String j2eeVersion)
-  {
-    j2eeVersion_ = j2eeVersion;
-    updateEAREnabledState();
-  }
-  
-  public void setProjectTypeId(String id)
-  {
-    projectTypeId_ = id;
-  }
-  
-  private void handleSetEarProjects() {
-    SelectionList projectList = projects_.getList();
-    projectList.setSelectionValue(project_.getText());
-    SelectionList earList = projects_.getChoice().getList();
-    ear_.removeListener(SWT.Modify, statusListener_);
-    ear_.setItems(earList.getList());
-    ear_.setText(earList.getSelection());
-    ear_.addListener(SWT.Modify, statusListener_);
-    updateEAREnabledState();
-    handleSetMessageText();
-  }
-
-  private void updateEAREnabledState()
-  {
-    ear_.removeListener(SWT.Modify, statusListener_);
-    if (projects_ != null)
-    {
-      SelectionList earList = projects_.getChoice().getList();
-      if(!projectNeedsEAR(project_.getText()))
-      {
-        earList.setIndex(-1);        
-        ear_.setText("");
-        needEAR_ = false;
-        ear_.setEnabled(false);        
-      }
-      else
-      {
-        needEAR_ = true;
-        ear_.setEnabled(true);
-      }
-    }
-    ear_.addListener(SWT.Modify, statusListener_);
-  }
-
-  private boolean projectNeedsEAR(String projectName)
-  {
-    if (projectTypeId_.equals(JAVA_PROJECT_TYPE_ID))
-      return false;
-    
-    if (projectName == null || projectName.length()==0)
-      return true;
-    
-    //IProject project = (IProject)((new StringToIProjectTransformer()).transform(projectName));
-	IProject project = ResourceUtils.getWorkspaceRoot().getProject(projectName);
-  	if (project != null && project.exists())
-  	{
-  	  //Get the runtime target on the project
-  	  IRuntime target = ServerSelectionUtils.getRuntimeTarget(projectName);
-  	  String j2eeVersion = String.valueOf(J2EEUtils.getJ2EEVersion(project));
-  	  if (target != null)
-  	  {
-  	  	if (!ServerUtils.isTargetValidForEAR(target.getRuntimeType().getId(),j2eeVersion))
-  	  	{
-          return false;
-  	  	}
-  	  		
-  	  }
-  	}
-  	else
-  	{
-  		//Use the server type
-  	    if (trsIds_ != null)
-  	    {
-  		  String targetId = ServerUtils.getRuntimeTargetIdFromFactoryId(trsIds_.getServerId());
-  		  if (targetId!=null && targetId.length()>0)
-  		  {
-  		    if (!ServerUtils.isTargetValidForEAR(targetId,j2eeVersion_))
-  		    {
-  		      return false;
-  	  	    }
-  		  }
-  	    }
-  	}      	
-  	
-  	return true;    
-  }
-  
-  private Status handleSetMessageText() {
-    Status status = new SimpleStatus("");
-    try {
-      byte result = (byte) 0;
-      if (project_.getText().length() != 0 && ear_.getText().length() != 0) {
-        String projectText = project_.getText();
-        String earText = ear_.getText();
-        IProject project = ResourceUtils.getWorkspaceRoot().getProject(projectText);
-        IProject ear = ResourceUtils.getWorkspaceRoot().getProject(earText);
-        if (project != null) {
-          if (!project.exists()) {
-            result = (byte) (result | CREATE_PROJECT);
-          }
-          if (!ear.exists()) {
-            result = (byte) (result | CREATE_EAR);
-          }
-          if (project.exists() && ear.exists()) {
-            if (!J2EEUtils.isEARAssociated(project, ear)) result = (byte) (result | ADD_EAR_ASSOCIATION);
-          }
-        }
-      }
-      if (isClient_) {
-        messageText_.setText(getValidationMessage(result, msgUtils.getMessage("MSG_CLIENT_SUB")));
-      }
-      else {
-        messageText_.setText(getValidationMessage(result, msgUtils.getMessage("MSG_SERVICE_SUB")));
-      }
-    }
-    catch (Exception e) {
-      return new SimpleStatus("", msgUtils.getMessage("PAGE_MSG_VALIDATION_INTERNAL_ERROR"), Status.ERROR);
-    }
-    return status;
-  }
-  
-  private String getValidationMessage(byte result, String serviceOrClient) {
-    String msg = null;
-    switch (result) {
-    case 0:
-      return "";
-    case 1:
-    case 5:
-      msg = "MSG_PROJECT_WILL_BE_CREATED";
-      break;
-    case 2:
-    case 6:
-      msg = "MSG_EAR_WILL_BE_CREATED";
-      break;
-    case 3:
-    case 7:
-      msg = "MSG_PROJECT_AND_EAR_CREATED";
-      break;
-    case 4:
-      msg = "MSG_EAR_WILL_BE_ASSOCIATED";
-      break;
-    }
-    return msg != null ? msgUtils.getMessage(msg, new Object[] { serviceOrClient}) : "";
-  }
-
-  public Status getStatus() {
-    Status finalStatus = new SimpleStatus("");
-    handleSetMessageText();
-    String projectText = project_.getText();
-    String earText = ear_.getText();
-    if (projectText==null || projectText.length()==0)
-    {
-      if (isClient_)
-        return new SimpleStatus("",msgUtils.getMessage("MSG_CLIENT_PROJECT_EMPTY"),Status.ERROR);
-      else
-        return new SimpleStatus("",msgUtils.getMessage("MSG_SERVICE_PROJECT_EMPTY"),Status.ERROR);
-    }
-    
-    if (needEAR_ && (earText==null || earText.length()==0))
-    {
-      if (isClient_)
-        return new SimpleStatus("",msgUtils.getMessage("MSG_CLIENT_EAR_EMPTY"),Status.ERROR);
-      else
-        return new SimpleStatus("",msgUtils.getMessage("MSG_SERVICE_EAR_EMPTY"),Status.ERROR);      
-    }
-    
-    return finalStatus;
-  }
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/RuntimeServerSelectionWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/RuntimeServerSelectionWidget.java
deleted file mode 100644
index 4249a0a..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/RuntimeServerSelectionWidget.java
+++ /dev/null
@@ -1,256 +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.consumption.ui.widgets.runtime;
-
-import org.eclipse.jface.window.Window;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.wizard.RuntimeServerSelectionDialog;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.jst.ws.internal.wsrt.WebServiceRuntimeExtensionUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.command.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.env.ui.widgets.WidgetDataEvents;
-
-
-
-public class RuntimeServerSelectionWidget extends SimpleWidgetDataContributor
-{
-  private String            pluginId_ = "org.eclipse.jst.ws.consumption.ui";
-  private Text              runtime_;
-  private Text              server_;
-  private Text              j2eeVersionText;
-  private Composite         parent_;
-  private boolean           isClientContext_;
-  private TypeRuntimeServer ids_;
-  private String             j2eeVersion_;
-  private MessageUtils       msgUtils_;
-  private Listener           statusListener_;
-  
-  /* CONTEXT_ID PWRS0004 for the service-side runtime selection of the runtime selection Page */
-  private String INFOPOP_PWRS_GROUP_SERVICE_RUNTIME = pluginId_ + ".PWRS0004";
-
-  /* CONTEXT_ID PWRS0005 for the service-sdie server selection of the runtime selection Page */
-  private String INFOPOP_PWRS_GROUP_SERVICE_SERVER = pluginId_ + ".PWRS0005";
-
-  /* CONTEXT_ID PWRS0009 for the J2EE version selection of the runtime selection Page */
-  private String INFOPOP_PWRS_J2EE_VERSION = pluginId_ + ".PWRS0009";
-
-  public RuntimeServerSelectionWidget( boolean isClientScenario )
-  {
-    isClientContext_ = isClientScenario; 
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.WidgetContributor#addControls(org.eclipse.swt.widgets.Composite, org.eclipse.swt.widgets.Listener)
-   */
-  public WidgetDataEvents addControls( Composite parent, Listener statusListener )
-  {
-    msgUtils_ = new MessageUtils( pluginId_ + ".plugin", this );
-    UIUtils      uiUtils  = new UIUtils(msgUtils_, pluginId_ ); 
-    
-    parent_         = parent;
-    statusListener_ = statusListener;
-        
-    // Runtime label and text
-    runtime_ = uiUtils.createText( parent, "LABEL_RUNTIMES_LIST",  
-                                   "TOOLTIP_PWRS_TEXT_RUNTIME",
-                                   INFOPOP_PWRS_GROUP_SERVICE_RUNTIME, SWT.READ_ONLY );
-    
-    // Server label and text
-    server_ = uiUtils.createText( parent, "LABEL_SERVERS_LIST",  
-                                  "TOOLTIP_PWRS_TEXT_SERVER",
-                                  INFOPOP_PWRS_GROUP_SERVICE_SERVER, SWT.READ_ONLY );
-    
-    j2eeVersionText = uiUtils.createText(parent, "LABEL_J2EE_VERSION", "TOOLTIP_PWRS_J2EE_VERSION", INFOPOP_PWRS_J2EE_VERSION, SWT.READ_ONLY);
-    
-    Button editButton = new Button( parent, SWT.NONE );
-    editButton.setText( msgUtils_.getMessage("LABEL_EDIT_BUTTON")); 
-    editButton.addSelectionListener( new SelectionAdapter()
-                                     {
-                                       public void widgetSelected( SelectionEvent  evt )
-                                       {
-                                         handleEditButton(); 
-                                       }
-                                     } );
-    
-    // Dummy label that goes on the right side of the edit button.
-    new Label( parent, SWT.NONE );
-    
-    return this;
-  }
-
-  public TypeRuntimeServer getTypeRuntimeServer()
-  {
-    return ids_;  
-  }
-  
-  public void setTypeRuntimeServer( TypeRuntimeServer ids )
-  {
-    ids_ = ids;
-    setLabels();
-  }
-  
-  public String getJ2EEVersion()
-  {
-    return j2eeVersion_;
-  }
-  
-  public void setJ2EEVersion(String j2eeVersion)
-  {
-    this.j2eeVersion_ = j2eeVersion;
-    j2eeVersionText.setText((j2eeVersion_ != null) ? J2EEUtils.getLabelFromJ2EEVersion(j2eeVersion_) : msgUtils_.getMessage("LABEL_NA"));
-    //setLabels();
-  }
-  
-  private void setLabels()
-  {
-	  // rskreg
-    //WebServiceClientTypeRegistry registry     = WebServiceClientTypeRegistry.getInstance();
-    //String                       runtimeLabel = registry.getRuntimeLabelById( ids_.getRuntimeId() );
-	String                       runtimeLabel = WebServiceRuntimeExtensionUtils.getRuntimeLabelById( ids_.getRuntimeId() );
-    String                       serverLabel  = null;
-    
-    if( ids_.getServerInstanceId() == null )
-    {
-      // Get the label for the general server type.
-      //WebServiceServer server = registry.getWebServiceServerByFactoryId( ids_.getServerId() );
-      //serverLabel = server == null ? "" : server.getLabel();
-		serverLabel = WebServiceRuntimeExtensionUtils.getServerLabelById(ids_.getServerId());
-    }
-    else
-    {
-      // Get the label for the server instance.
-      //serverLabel = registry.getServerInstanceLabelFromInstanceId( ids_.getServerInstanceId() );
-		serverLabel = WebServiceRuntimeExtensionUtils.getServerInstanceLabelFromInstanceId(ids_.getServerInstanceId());
-    }
-    // rskreg
-    runtimeLabel = runtimeLabel == null ? "" : runtimeLabel;
-    
-    runtime_.setText( runtimeLabel );
-    server_.setText( serverLabel );
-    j2eeVersionText.setText((j2eeVersion_ != null) ? J2EEUtils.getLabelFromJ2EEVersion(j2eeVersion_) : msgUtils_.getMessage("LABEL_NA"));
-  }
-  
-  public void handleEditButton()
-  {
-    byte mode = isClientContext_ ? (byte)1 : (byte)0;
-    
-    RuntimeServerSelectionDialog dialog     
-      = dialog = new RuntimeServerSelectionDialog( parent_.getShell(), mode, ids_, j2eeVersion_ );
-    dialog.create();
-    dialog.handleServerViewSelectionEvent();
-    int result = dialog.open();
-
-    if (result == Window.OK)
-    {
-      ids_ = dialog.getTypeRuntimeServer();
-      j2eeVersion_ = dialog.getJ2EEVersion();
-      setLabels();
-      statusListener_.handleEvent(null);
-    }  
-  }  
-  
-  public void addModifyListener(ModifyListener listener)
-  {
-    if (runtime_ != null)
-      runtime_.addModifyListener(listener);
-  }
-  
-  public void removeModifyListener(ModifyListener listener)
-  {
-    if (runtime_ != null)
-      runtime_.removeModifyListener(listener);
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.WidgetContributor#getStatus()
-   */
-  public Status getStatus() 
-  {
-    Status status = new SimpleStatus( "" );
-    String scenario = isClientContext_ ? msgUtils_.getMessage( "MSG_CLIENT_SUB" )
-                                        : msgUtils_.getMessage( "MSG_SERVICE_SUB" );
-    
-    // Kludge!!!  We shouldn't have to check for blank labels.  The defaulting commands should be setting the
-    //            ids to null if there isn't a valid one.  This code should be removed in C4.
-	
-	// rskreg
-    //WebServiceClientTypeRegistry wsctRegistry = WebServiceClientTypeRegistry.getInstance();
-    //String                       runtimeLabel = wsctRegistry.getRuntimeLabelById( ids_.getRuntimeId() );
-	String                       runtimeLabel = WebServiceRuntimeExtensionUtils.getRuntimeLabelById( ids_.getRuntimeId() );
-    //WebServiceServer             server       = wsctRegistry.getWebServiceServerByFactoryId( ids_.getServerId() );
-    //String                       serverLabel  = server == null ? "" : server.getLabel();
-	String                       serverLabel  = WebServiceRuntimeExtensionUtils.getServerLabelById(ids_.getServerId());
-    // rskreg
-	
-    if( ids_.getRuntimeId() == null || runtimeLabel == null || runtimeLabel.equals("" ))
-    {
-      status = new SimpleStatus( "", msgUtils_.getMessage( "MSG_NO_RUNTIME", new String[]{ scenario } ), Status.ERROR );
-    }
-    else if( ids_.getServerId() == null || serverLabel.equals( "" ))
-    {
-      status = new SimpleStatus( "", msgUtils_.getMessage( "MSG_NO_SERVER", new String[]{ scenario } ), Status.ERROR );      
-    }
-
-	//--------- check if WSCT exists for these selections
-	if (!(ids_.getServerId() == null) && !(ids_.getRuntimeId() == null) && isClientContext_)
-	{
-		// rskreg
-		if (!WebServiceRuntimeExtensionUtils.webServiceClientRuntimeTypeExists( ids_.getServerId(), ids_.getRuntimeId(), ids_.getTypeId())) 
-		{
-			status = new SimpleStatus( "", msgUtils_.getMessage( "MSG_INVALID_SRT_SELECTIONS", new String[]{ scenario } ), Status.ERROR );		  
-		}
-		/*
-		WebServiceServer wss = wsctRegistry.getWebServiceServerByFactoryId(ids_.getServerId());
-		if (wss != null)
-		{
-			String serverTypeId = wss.getId();
-			String runtimeId = ids_.getTypeId();
-			if (!wsctRegistry.webServiceClientRuntimeTypeExists( serverTypeId, ids_.getRuntimeId(), runtimeId)) {
-				status = new SimpleStatus( "", msgUtils_.getMessage( "MSG_INVALID_SRT_SELECTIONS", new String[]{ scenario } ), Status.ERROR );		  
-			}
-		}
-		else
-			status = new SimpleStatus( "", msgUtils_.getMessage( "MSG_INVALID_SRT_SELECTIONS", new String[]{ scenario } ), Status.ERROR );
-		*/
-		// rskreg
-	}    
-    
-    //--------- check if WSSRT exists for these selections
-    if (!(ids_.getServerId() == null) && !(ids_.getRuntimeId() == null) && !isClientContext_)
-    {
-		// rskreg
-      //WebServiceServerRuntimeTypeRegistry wssrtRegistry = WebServiceServerRuntimeTypeRegistry.getInstance();
-      //String serverTypeId = wsctRegistry.getWebServiceServerByFactoryId(ids_.getServerId()).getId();
-      //if (!wssrtRegistry.isServerRuntimeTypeSupported(serverTypeId, ids_.getRuntimeId(), ids_.getTypeId())) {
-	  if (!WebServiceRuntimeExtensionUtils.isServerRuntimeTypeSupported(ids_.getServerId(), ids_.getRuntimeId(), ids_.getTypeId())) {	  
-        status = new SimpleStatus( "", msgUtils_.getMessage( "MSG_INVALID_SRT_SELECTIONS", new String[]{ scenario } ), Status.ERROR );      
-      }
-	  // rskreg
-    }
-	
-    
-    
-    return status;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/AddModuleDependenciesCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/AddModuleDependenciesCommand.java
deleted file mode 100644
index 2dd4495..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/AddModuleDependenciesCommand.java
+++ /dev/null
@@ -1,240 +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.consumption.ui.widgets.test;
-
-import java.io.IOException;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.j2ee.applicationclient.internal.creation.IApplicationClientNatureConstants;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifest;
-import org.eclipse.jst.j2ee.internal.earcreation.AddUtilityJARMapCommand;
-import org.eclipse.jst.j2ee.internal.earcreation.EARNatureRuntime;
-import org.eclipse.jst.j2ee.internal.project.IEJBNatureConstants;
-import org.eclipse.jst.j2ee.internal.project.IWebNatureConstants;
-import org.eclipse.jst.j2ee.internal.project.J2EENature;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.server.core.IServer;
-
-public class AddModuleDependenciesCommand extends SimpleCommand
-{
-  private String sampleProject;
-  private String sampleEAR;
-  private String clientProject;
-  private String sampleServerTypeID;
-  private IServer sampleExistingServer;
-  private String clientJ2EEVersion;
-
-  public AddModuleDependenciesCommand()
-  {
-    super("org.eclipse.jst.ws.internal.consumption.command.common.AddModuleDependenciesTask", "org.eclipse.jst.ws.internal.consumption.command.common.AddModuleDependenciesTask");
-  }
-
-  /**
-   * Execute WebServerDefaultingTask Set the default server name and id given a
-   * deployable.
-   */
-  public Status execute(Environment env)
-  {
-    try
-    {
-      IResource res = (IProject)ResourceUtils.findResource(sampleProject);
-      IProject sampleIProject = null;
-      if (res instanceof IProject)
-        sampleIProject = (IProject)res;
-      if (sampleIProject == null)
-      {
-        CreateSampleProjectCommand createSample = new CreateSampleProjectCommand();
-        createSample.setSampleProject(sampleProject);
-        createSample.setSampleProjectEAR(sampleEAR);
-        if (sampleEAR!=null && sampleEAR.length()>0)
-          createSample.setNeedEAR(true);    
-        createSample.setExistingServer(sampleExistingServer);
-        createSample.setServerFactoryId(sampleServerTypeID);
-        createSample.setJ2eeVersion(clientJ2EEVersion);
-        Status status = createSample.execute(env);
-      }
-      res = ResourceUtils.findResource(sampleProject);
-      if (res instanceof IProject)
-        sampleIProject = (IProject)res;
-      res = ResourceUtils.findResource(sampleEAR);
-      IProject sampleIEAR = null;
-      if (res instanceof IProject)
-        sampleIEAR = (IProject)res;
-      if (sampleIProject == null)
-        return new SimpleStatus("", "", Status.ERROR);
-      res = ResourceUtils.findResource(clientProject);
-      IProject clientIProject = null;
-      if (res instanceof IProject)
-        clientIProject = (IProject)res;
-      if (clientIProject != null && !ResourceUtils.isWebProject(clientIProject))
-      {
-        String uri = clientIProject.getName() + ".jar";
-        if (ResourceUtils.isTrueJavaProject(clientIProject))
-          addJavaProjectAsUtilityJar(clientIProject, sampleIEAR, uri);
-        addJAROrModuleDependency(sampleIProject, uri);
-        addBuildPath(sampleIProject, clientIProject);
-      }
-    }
-    catch (IOException ioe)
-    {
-    }
-    catch (CoreException ce)
-    {
-    }
-    return new SimpleStatus("");
-  }
-
-  private void addJavaProjectAsUtilityJar(IProject javaProject, IProject earProject, String uri)
-  {
-    AddUtilityJARMapCommand cmd = new AddUtilityJARMapCommand(earProject, uri, javaProject);
-    cmd.execute();
-  }
-
-  private void addJAROrModuleDependency(IProject project, String uri) throws IOException, CoreException
-  {
-    J2EENature nature = null;
-    if (ResourceUtils.isWebProject(project))
-      nature = getWebNature(project);
-    else if (ResourceUtils.isAppClientProject(project))
-      nature = getAppClientNature(project);
-    else if (ResourceUtils.isEJBProject(project))
-      nature = getEJBNature(project);
-    if (nature != null)
-    {
-      ArchiveManifest manifest = J2EEProjectUtilities.readManifest(project);
-      manifest.mergeClassPath(new String[]{uri});
-      J2EEProjectUtilities.writeManifest(project, manifest);
-    }
-  }
-
-  private void addBuildPath(IProject referencingProject, IProject referencedProject) throws JavaModelException
-  {
-    IJavaProject javaProject = JavaCore.create(referencingProject);
-    if (javaProject != null)
-    {
-      IClasspathEntry[] oldCp = javaProject.getRawClasspath();
-      IClasspathEntry[] newCp = new IClasspathEntry[oldCp.length];
-      for (int i = 0; i < oldCp.length; i++)
-        newCp[i] = oldCp[i];
-      newCp[newCp.length - 1] = JavaCore.newProjectEntry(referencedProject.getFullPath());
-      javaProject.setRawClasspath(newCp, new NullProgressMonitor());
-    }
-  }
-
-  private J2EENature getWebNature(IProject project)
-  {
-    try
-    {
-      return (J2EENature)project.getNature(IWebNatureConstants.J2EE_NATURE_ID);
-    }
-    catch (CoreException ce)
-    {
-    }
-    return null;
-  }
-
-  private J2EENature getAppClientNature(IProject project)
-  {
-    for (int i = 0; i < IApplicationClientNatureConstants.APPCLIENT_NATURE_IDS.length; i++)
-    {
-      try
-      {
-        return (J2EENature)project.getNature(IApplicationClientNatureConstants.APPCLIENT_NATURE_IDS[i]);
-      }
-      catch (CoreException ce)
-      {
-      }
-    }
-    return null;
-  }
-
-  private J2EENature getEJBNature(IProject project)
-  {
-    try
-    {
-      // ksc return
-      // (J2EENature)project.getNature(IEJBNatureConstants.EJB_20_NATURE_ID);
-      return (J2EENature)project.getNature(IEJBNatureConstants.NATURE_ID);
-    }
-    catch (CoreException ce)
-    {
-    }
-    try
-    {
-      return (J2EENature)project.getNature(IEJBNatureConstants.NATURE_ID);
-    }
-    catch (CoreException ce)
-    {
-    }
-    return null;
-  }
-
-  private IProject getEARProject(IProject sampleProject)
-  {
-    EARNatureRuntime[] natures = J2EEUtils.getEARProjects(sampleProject);
-    if (natures != null && natures.length > 0)
-      return natures[0].getProject();
-    else
-      return null;
-  }
-
-  /**
-   * @param proxyProject
-   *          The proxyProject to set.
-   */
-  public void setSampleProject(String sampleProject)
-  {
-    this.sampleProject = sampleProject;
-  }
-
-  public String getSampleProject()
-  {
-    return sampleProject;
-  }
-
-  public void setSampleProjectEAR(String sampleEAR)
-  {
-    this.sampleEAR = sampleEAR;
-  }
-
-  public void setClientProject(String clientProject)
-  {
-    this.clientProject = clientProject;
-  }
-
-  public void setSampleServerTypeID(String sampleServerTypeID)
-  {
-    this.sampleServerTypeID = sampleServerTypeID;
-  }
-
-  public void setSampleExistingServer(IServer sampleExistingServer)
-  {
-    this.sampleExistingServer = sampleExistingServer;
-  }
-  
-  public void setClientJ2EEVersion(String clientJ2EEVersion)
-  {
-    this.clientJ2EEVersion = clientJ2EEVersion;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/ClientTestDelegateCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/ClientTestDelegateCommand.java
deleted file mode 100644
index 968bc55..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/ClientTestDelegateCommand.java
+++ /dev/null
@@ -1,307 +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.consumption.ui.widgets.test;
-
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.jst.ws.internal.context.ScenarioContext;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.jst.ws.internal.ext.WebServiceExecutable;
-import org.eclipse.jst.ws.internal.ext.test.JavaProxyTestCommand;
-import org.eclipse.jst.ws.internal.ext.test.WSDLTestFinishCommand;
-import org.eclipse.jst.ws.internal.ext.test.WebServiceTestExtension;
-import org.eclipse.jst.ws.internal.ext.test.WebServiceTestFinishCommand;
-import org.eclipse.jst.ws.internal.ext.test.WebServiceTestRegistry;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.command.env.core.common.StatusHandler;
-import org.eclipse.wst.command.env.core.selection.BooleanSelection;
-import org.eclipse.wst.command.env.core.selection.SelectionList;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-
-
-/*
-* The JSPGeneration task runs the jsp generation engine found in the 
-* JBWizard Plugin
-*
-*
-*/
-public class ClientTestDelegateCommand extends SimpleCommand
-{
-  private String LABEL = "JSPGenerationTask";
-  private String DESCRIPTION = "Run the JSP Generation";
-  
-  private ScenarioContext scenarioContext;
-  private WebServiceTestRegistry testRegistry;
-  private SelectionList testFacilities;
-  private String folder;
-  private String jspFolder;
-  private BooleanSelection[] methods;
-  private boolean runClientTest=true;
-  private String sampleServerTypeID;
-  private IServer sampleExistingServer;
-  private String proxyBean;
-  private String sampleProject;
-  private String clientProject;
-  private String clientServer;
-  private TypeRuntimeServer clientIds;
-  private TypeRuntimeServer serverIds;
-  private String serviceProject;
-  private String wsdlServiceURL;
-  private boolean generateProxy;
-  private boolean isTestWidget = false;
-  private String setEndpointMethod;
-  private List endpoints;
-
-  public ClientTestDelegateCommand ()
-  {
-    setDescription(DESCRIPTION);
-    setName(LABEL);  
-    scenarioContext = WebServicePlugin.getInstance().getScenarioContext().copy();
-    testRegistry = WebServiceTestRegistry.getInstance();
-  }
-
-  public Status execute(Environment env)
-  {
-  	Status status = new SimpleStatus( "" );
-  	String clientTestID = testFacilities.getSelection();
-  	WebServiceTestFinishCommandFactory wtfcf = new WebServiceTestFinishCommandFactory();
-  	WebServiceTestFinishCommand command = wtfcf.getWebServiceTestFinishCommand(clientTestID,env);
-     
-    command.setExistingServer(sampleExistingServer);
-    command.setServerTypeID(sampleServerTypeID);
-    status = command.execute(env);
-    if(status.getSeverity() == Status.ERROR){
-      StatusHandler sHandler = env.getStatusHandler();
-      sHandler.reportError(status);
-      return status;
-    }
-    return status;
-  }
-  
-  private class WebServiceTestFinishCommandFactory
-  {
-  
-    private WebServiceTestFinishCommand getWebServiceTestFinishCommand(String clientTestID,Environment env)
-    {
-  	  WebServiceTestExtension wscte = (WebServiceTestExtension)testRegistry.getWebServiceExtensionsByName(clientTestID);
-  	  boolean isJava = true;
-  	  if(wscte.isJava() && !generateProxy){
-  	  	isJava = false;
-        wscte = (WebServiceTestExtension)testRegistry.getWebServiceExtensionsByName(scenarioContext.getNonJavaTestService());   	  
-  	  }
-  	  if(!wscte.isJava())
-  	    isJava = false;	
-  	  WebServiceExecutable wse = wscte.getWebServiceExecutableExtension();
-      
-      if(isJava){
-        JavaProxyTestCommand command = (JavaProxyTestCommand)wse.getFinishCommand();
-        command.setProxyBean(proxyBean);
-        command.setSampleProject(sampleProject);
-        command.setClientProject(clientProject);
-        command.setRunClientTest(runClientTest);
-        command.setJspFolder(jspFolder); 
-        command.setSetEndpointMethod(setEndpointMethod);
-        command.setMethods(methods);
-        command.setEndpoint(endpoints);
-        if (clientIds.getServerInstanceId() != null) 
-      	  sampleExistingServer = ServerCore.findServer(clientIds.getServerInstanceId());
-      	if (sampleExistingServer != null)
-      	  sampleServerTypeID = sampleExistingServer.getServerType().getId();
-      	else
-      	  sampleServerTypeID = clientIds.getServerId();
-      	// server will be created in ServerDeployableConfigurationCommand
-      	
-        return command;
-      }
-      else{
-      	WSDLTestFinishCommand wtfc = (WSDLTestFinishCommand)wse.getFinishCommand();
-      	wtfc.setServiceProject(getWSDLProject());
-    	wtfc.setWsdlServiceURL(wsdlServiceURL);
-    	wtfc.setExternalBrowser(false);
-    	wtfc.setEndpoint(endpoints);
-    	if(serverIds != null){
-    	  if (serverIds.getServerInstanceId() != null) 
-    	    sampleExistingServer = ServerCore.findServer(serverIds.getServerInstanceId());
-    	  if (sampleExistingServer != null)
-    	    sampleServerTypeID = sampleExistingServer.getServerType().getId();
-    	  else
-    	    sampleServerTypeID = serverIds.getServerId();
-    	  // server will be created in ServerDeployableConfigurationCommand
-    	}
-    	else if(clientIds != null)
-    	{
-          if (clientIds.getServerInstanceId() != null) 
-            sampleExistingServer = ServerCore.findServer(clientIds.getServerInstanceId());
-          if (sampleExistingServer != null)
-            sampleServerTypeID = sampleExistingServer.getServerType().getId();
-          else
-            sampleServerTypeID = clientIds.getServerId();
-          // server will be created in ServerDeployableConfigurationCommand
-            		
-    	}
-    	return wtfc; 
-      } 	
-    }
-  
-    public Status getStatus()
-    {
-      return new SimpleStatus("");	
-    }
-  
-  }
-
-  //The test facilities retrieved from the extension
-  //plus the default
-  public void setTestFacility(SelectionList selection)
-  {
-    testFacilities = selection;
-  } 
-  
-  public void setFolder(String folder)
-  {
-  	this.folder = folder;
-  }
-  
-  public void setJspFolder(String jspFolder)
-  {
-  	this.jspFolder = jspFolder;
-  }
-  
-  public void setMethods(BooleanSelection[] methods)
-  {
-    this.methods = methods;  
-  }
- 
-  public void setRunClientTest(boolean runClientTest)
-  {
-  	this.runClientTest = runClientTest;
-  }
-  
-  public void setProxyBean(String proxyBean)
-  {
-  	this.proxyBean = proxyBean;
-  }
-  
-  public void setSampleProject(String sampleProject)
-  {
-  	this.sampleProject = sampleProject;
-  }
-  
-  public void setClientProject(String clientProject)
-  {
-  	this.clientProject = clientProject;
-  }
-  
-  public void setScenarioContext(ScenarioContext scenarioContext)
-  {
-  	this.scenarioContext = scenarioContext;
-  }
-  
-  public void setClientTestRegistry(WebServiceTestRegistry testRegistry)
-  {
-  	this.testRegistry = testRegistry;
-  }
-   
-  public void setSampleServerTypeID(String sampleServerTypeID)
-  {
-  	this.sampleServerTypeID = sampleServerTypeID;
-  }
-  
-  public void setSampleExistingServer(IServer sampleExistingServer)
-  {
-  	this.sampleExistingServer = sampleExistingServer;
-  }
-
-  public void setClientTypeRuntimeServer(TypeRuntimeServer ids)
-  {
-    clientIds = ids;
-  }
-  
-  public void setServiceTypeRuntimeServer(TypeRuntimeServer ids)
-  {
-    serverIds = ids;
-  }
-  
-  public String getSampleServerTypeID()
-  {
-  	return sampleServerTypeID;
-  }
-  
-  public IServer getSampleExistingServer()
-  {
-  	return sampleExistingServer;
-  }
-
-  public void setClientServer(String clientServer)
-  {
-  	this.clientServer = clientServer;
-  }
-  
-  public void setServerProject(String serviceProject)
-  {
-  	this.serviceProject = serviceProject;
-  }
-  
-  public String getWSDLProject()
-  {
-  	if(serviceProject != null)
-     return serviceProject;
-  	
-  	return clientProject;
-  }
-  
-  public void setWsdlURI(String wsdlServiceURL)
-  {
-    this.wsdlServiceURL = wsdlServiceURL;
-  }
- 
-  public void setGenerateProxy(boolean generateProxy)
-  {
-  	this.generateProxy = generateProxy;
-  }
-  
-  public boolean getIsTestWidget()
-  {
-  	return isTestWidget;
-  }
-
-  /**
-   * @param setEndpointMethod The setEndpointMethod to set.
-   */
-  public void setSetEndpointMethod(String setEndpointMethod)
-  {
-    this.setEndpointMethod = setEndpointMethod;
-  }
-  /**
-   * @param endpoint The endpoint to set.
-   */
-  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;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/ClientTestFragment.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/ClientTestFragment.java
deleted file mode 100644
index 1c53134..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/ClientTestFragment.java
+++ /dev/null
@@ -1,59 +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.consumption.ui.widgets.test;
-
-import org.eclipse.wst.command.env.core.common.Condition;
-import org.eclipse.wst.command.env.core.fragment.BooleanFragment;
-import org.eclipse.wst.command.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.env.core.fragment.SimpleFragment;
-
-
-public class ClientTestFragment extends BooleanFragment
-{
-  private boolean testService;
-  private boolean genProxy;
-  private boolean launchedTest = false;
-  
-  public ClientTestFragment( String id )
-  {
-    SequenceFragment clientTestRoot = new SequenceFragment();
-    Condition        condition      = new Condition()
-                                      {
-                                        public boolean evaluate()
-                                        {
-                                          return testService && genProxy;
-                                        }
-                                      };
-    setCondition( condition );
-    
-    clientTestRoot.add( new SimpleFragment( new WebServiceClientTestArrivalCommand(), "" ) );
-    clientTestRoot.add( new SimpleFragment( id ) );
-    setTrueFragment( clientTestRoot );
-    
-  }
-  
-  public void setGenerateProxy( boolean genProxy )
-  {
-    this.genProxy = genProxy;  
-  }
-  
-  public void setTestService( Boolean testService )
-  {
-    this.testService = testService.booleanValue();  
-  } 
-
-  public boolean getLaunchedTest()
-  {
-  	return launchedTest;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/ClientTestWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/ClientTestWidget.java
deleted file mode 100644
index 1f1132c..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/ClientTestWidget.java
+++ /dev/null
@@ -1,417 +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.consumption.ui.widgets.test;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-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.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.common.FolderResourceFilter;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.jst.ws.internal.ui.dialog.DialogUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-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.Listener;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.swt.widgets.TreeItem;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.selection.BooleanSelection;
-import org.eclipse.wst.command.env.core.selection.SelectionList;
-import org.eclipse.wst.command.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.env.ui.widgets.WidgetDataEvents;
-
-
-public class ClientTestWidget extends SimpleWidgetDataContributor
-{
-  private String pluginId_ = "org.eclipse.jst.ws.consumption.ui";
-
-  /*CONTEXT_ID PWSM0001 for the Sample Page*/
-  private String INFOPOP_PWSM_PAGE =  "PWSM0001";
-  //
-  private Button testCheckbox_;
-  /*CONTEXT_ID PWSM0002 for the Test check box of the Sample Page*/
-  private String INFOPOP_PWSM_CHECKBOX_TEST = "PWSM0002";
-
-  private Combo testTypeCombo_;
-   /*CONTEXT_ID PWSM0003 for the Test Type Combo box of the Sample Page*/
-  private String INFOPOP_PWSM_COMBOBOX_TEST = "PWSM0003";
-
-  private Text  jspFolderText_;
-  /*CONTEXT_ID PWSM0008 for the JSP Folder field of the Sample Page*/
-  private String INFOPOP_PWSM_TEXT_JSP_FOLDER = "PWSM0008";
-
-  private Button sampleFolderBrowseButton_;
-  /*CONTEXT_ID PWSM0009 for the JSP Folder Browse button of the Sample Page*/
-  private String INFOPOP_PWSM_BUTTON_JSP_FOLDER_BROWSE = "PWSM0009";
-
-  private Combo projectCombo_;
-  /*CONTEXT_ID PWSM0010 for the Project combo box of the Sample Page*/
-  private String INFOPOP_PWSM_COMBO_PROJECT = "PWSM0010";
-
-  private Tree methodsTree_;
-  /*CONTEXT_ID PWSM0005 for the Methods tree of the Sample Page*/
-  private String INFOPOP_PWSM_TREE_METHODS = "PWSM0005";
-
-  private Button selectAllMethodsButton_;
-  /*CONTEXT_ID PWSM0006 for the Select All button of the Sample Page*/
-  private String INFOPOP_PWSM_BUTTON_SELECT_ALL = "PWSM0006";
-
-  private Button deselectAllMethodsButton_;
-  /*CONTEXT_ID PWSM0007 for the Deselect All button of the Sample Page*/
-  private String INFOPOP_PWSM_BUTTON_DESELECT_ALL = "PWSM0007";
-
-  private Text sampleFolderText_;
-  /*CONTEXT_ID PWSM0014 for the Folder field of the Sample Page*/   
-  private String INFOPOP_PWSM_TEXT_SAMPLE_FOLDER = "PWSM0014";
-  //
-  private Button runTestCheckbox_;  
-  /*CONTEXT_ID PWSM0015 for the run test check box of the Sample Page*/
-  private String INFOPOP_PWSM_CHECKBOX_LAUNCH = "PWSM0015";
-  //
-  private Combo earCombo_;
-  /*CONTEXT_ID PWSM0016 for the EAR combo box of the Sample Page*/
-  private String INFOPOP_PWSM_EAR_COMBO = "PWSM0016";
-  
-  private Label                projectExistsLabel_;
-  private Label                earExistsLabel_;
-  private Composite            comboGroup_; 
-  private SelectionList        testFacilities_;
-  private FolderResourceFilter folderFilter_ = new FolderResourceFilter();
-  private IStructuredSelection initialSelection_;
-  private String launchedServiceTestName;
-  private boolean isTestWidget = false;
-  
-  public WidgetDataEvents addControls( Composite parent, Listener statusListener )
-  {
-    isTestWidget = true;
-  	MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
-    UIUtils      uiUtils  = new UIUtils(msgUtils, pluginId_ );
-        
-	parent.setToolTipText( msgUtils.getMessage( "TOOLTIP_PWSM_PAGE" ) );
-	PlatformUI.getWorkbench().getHelpSystem().setHelp( parent, pluginId_ + "." + INFOPOP_PWSM_PAGE );
-    
-    testCheckbox_ = uiUtils.createCheckbox( parent, "BUTTON_TEST",
-                                            "TOOLTIP_PWSM_CHECKBOX_TEST",
-                                            INFOPOP_PWSM_CHECKBOX_TEST );
-    testCheckbox_.addSelectionListener( new SelectionAdapter()
-                                        {
-                                          public void widgetSelected( SelectionEvent evt )
-                                          {
-                                            handleTestButton();
-                                          }
-                                        });
-    
-    comboGroup_ = uiUtils.createComposite( parent, 3, 5, 0 );
-    
-    testTypeCombo_ = uiUtils.createCombo( comboGroup_, "LABEL_TEST_TYPES",
-                                          "TOOLTIP_PWSM_COMBOBOX_TEST",
-                                          INFOPOP_PWSM_COMBOBOX_TEST,
-                                          SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
-    Label dummyLabel = new Label( comboGroup_, SWT.NONE );
-    
-    projectCombo_ = uiUtils.createCombo( comboGroup_, "LABEL_JSP_PROJECT_NAME",
-                                          "TOOLTIP_PWSM_COMBO_PROJECT",
-                                          INFOPOP_PWSM_COMBO_PROJECT,
-                                          SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
-    projectCombo_.setEnabled( false );
-    projectExistsLabel_ = new Label( comboGroup_, SWT.NONE );
-    
-    
-    earCombo_ = uiUtils.createCombo( comboGroup_, "LABEL_EAR_PROJECT",
-                                     "TOOLTIP_PWSM_EAR_PROJECT",
-                                     INFOPOP_PWSM_EAR_COMBO,
-                                     SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
-    earCombo_.setEnabled( false );
-    earExistsLabel_ = new Label( comboGroup_, SWT.NONE );
-    
-    
-    
-    sampleFolderText_ = uiUtils.createText( comboGroup_, "LABEL_FOLDER_NAME",
-                                            "TOOLTIP_PWSM_TEXT_SAMPLE_FOLDER",
-                                            INFOPOP_PWSM_TEXT_SAMPLE_FOLDER,
-                                            SWT.SINGLE | SWT.BORDER );
-    
-    sampleFolderText_.addModifyListener( new ModifyListener()
-        {
-        public void modifyText( ModifyEvent evt )
-        {
-          handleFolderText(); 
-        }
-      });
-    
-       
-    sampleFolderBrowseButton_ = uiUtils.createPushButton( comboGroup_, "BUTTON_BROWSE", 
-                                                          "TOOLTIP_PWSM_BUTTON_JSP_FOLDER_BROWSE",
-                                                          INFOPOP_PWSM_BUTTON_JSP_FOLDER_BROWSE );
-    sampleFolderBrowseButton_.addSelectionListener( new SelectionAdapter()
-                                                    {
-                                                      public void widgetSelected( SelectionEvent evt )
-                                                      {
-                                                        handleSampleBrowse(); 
-                                                      }
-                                                    });
-    
-    jspFolderText_ = uiUtils.createText( comboGroup_, "LABEL_JSP_FOLDER_NAME",
-            "TOOLTIP_PWSM_TEXT_JSP_FOLDER",
-            INFOPOP_PWSM_TEXT_JSP_FOLDER,
-            SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
-    jspFolderText_.setEnabled( false );
-    
-    Group methodsGroup = uiUtils.createGroup( parent, "LABEL_METHODS",  
-                                             "TOOLTIP_PWSM_TREE_METHODS", null );
-    
-	methodsGroup.setLayoutData( uiUtils.createFillAll() );
-	
-	GridLayout layout = new GridLayout();
-	layout.marginHeight = 0;
-	layout.marginWidth = 0;
-	methodsGroup.setLayout( layout );
-	
-	// TODO No infopop for this tree.
-	methodsTree_ = uiUtils.createTree( methodsGroup, "TOOLTIP_PWSM_TREE_METHODS", 
-	                                   null,
-	                   				   SWT.MULTI | SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL	| SWT.CHECK );
-
-    Composite selectButtons = uiUtils.createComposite( methodsGroup, 2 );
-    
-    selectAllMethodsButton_ 
-      = uiUtils.createPushButton( selectButtons, "BUTTON_SELECT_ALL", 
-                                                 "TOOLTIP_PWSM_BUTTON_SELECT_ALL",
-                                                 INFOPOP_PWSM_BUTTON_SELECT_ALL );
-    selectAllMethodsButton_.addSelectionListener( new SelectionAdapter() 
-                                                  {
-                                                    public void widgetSelected( SelectionEvent evt )
-                                                    {
-                                                      handleSelectAll( true );
-                                                    }
-                                                  });
-    
-    deselectAllMethodsButton_ 
-      = uiUtils.createPushButton( selectButtons, "BUTTON_DESELECT_ALL", 
-                                  "TOOLTIP_PWSM_BUTTON_DESELECT_ALL",
-                                  INFOPOP_PWSM_BUTTON_DESELECT_ALL );
-    deselectAllMethodsButton_.addSelectionListener( new SelectionAdapter() 
-                                                    {
-                                                      public void widgetSelected( SelectionEvent evt )
-                                                      {
-                                                        handleSelectAll( false );
-                                                      }
-                                                    });
-    
-    runTestCheckbox_ = uiUtils.createCheckbox( parent, "BUTTON_RUN_TEST",
-                                               "TOOLTIP_PWSM_CHECKBOX_LAUNCH",
-                                               INFOPOP_PWSM_CHECKBOX_LAUNCH );
-    
-    return this;
-  }
-  
-  private void handleFolderText()
-  {
-  	String folder = sampleFolderText_.getText();	
-    String jspFolder = jspFolderText_.getText();
-    int index = jspFolder.lastIndexOf(Path.SEPARATOR);
-    if(index == -1) return;
-    jspFolder = jspFolder.substring(0,index + 1);
-    jspFolder = jspFolder + folder;
-    jspFolderText_.setText(jspFolder);
-  }
-  
-  private void handleSampleBrowse()
-  {
-    IPath      selectedPath       = null;
-    IResource  initialResource    = null;
-    IPath      projectPath        = new Path( projectCombo_.getText() ).makeAbsolute();
-    IResource  project            = ResourceUtils.findResource( projectPath );
-//    IContainer webModuleContainer = ResourceUtils.getWebModuleServerRoot( (IProject)project);
-    IContainer webModuleContainer = J2EEUtils.getFirstWebContentContainer((IProject)project);  
-    try
-    {
-      initialResource = ResourceUtils.getResourceFromSelection( initialSelection_ );
-    }
-    catch( CoreException exc )
-    {  
-    }
-    
-    if( initialResource == null )initialResource = project;
-    
-    IResource resource = DialogUtils.browseResources( comboGroup_.getShell(), 
-                                                      project,
-                                                      initialResource, 
-                                                      folderFilter_ );
-    
-    if( resource != null )
-    {
-      selectedPath = resource.getFullPath();   
-    
-      int webModuleSegments = selectedPath.matchingFirstSegments(webModuleContainer.getFullPath());
-      
-      if ( webModuleSegments < 2 )
-      {
-        sampleFolderText_.setText("");
-        handleFolderText();
-      }
-      else
-      {
-        sampleFolderText_.setText(selectedPath.removeFirstSegments(webModuleSegments).toString());
-        handleFolderText();
-      }
-    }
-  }
-  
-  private void handleTestButton()
-  {
-    boolean enabled = testCheckbox_.getSelection();
-    
-    testTypeCombo_.setEnabled( enabled );
-    sampleFolderText_.setEnabled( enabled );
-    methodsTree_.setEnabled( enabled );
-    runTestCheckbox_.setEnabled( enabled );
-    selectAllMethodsButton_.setEnabled( enabled );
-    deselectAllMethodsButton_.setEnabled( enabled );
-    sampleFolderBrowseButton_.setEnabled( enabled );
-  }
-  
-  private void handleSelectAll( boolean value )
-  {
-	TreeItem[] items = methodsTree_.getItems();
-	
-	for( int i = 0; i < items.length; i++ ) 
-	{
-	  items[i].setChecked(value);
-	}
-  } 
-  
-  // Here are the getters and setters for this widget.
-  public void setTestService( Boolean testService )
-  {
-    testCheckbox_.setSelection( testService.booleanValue() );
-    handleTestButton();
-  }
-  
-  public Boolean getTestService()
-  {
-    return new Boolean( testCheckbox_.getSelection() );
-  }
-  
-  public void setTestFacility( SelectionList testFacilities )
-  {
-    testFacilities_ = testFacilities;
-    testTypeCombo_.setItems( testFacilities.getList() );
-    testTypeCombo_.select( testFacilities.getIndex() );
-  }
-  
-  public SelectionList getTestFacility()
-  {
-    testFacilities_.setIndex( testTypeCombo_.getSelectionIndex() );
-    return testFacilities_;
-  }
-  
-  public String getTestID()
-  {
-    return testTypeCombo_.getText();
-  }
-  
-  public void setSampleProject(String clientProject) 
-  {
-	projectCombo_.setItems( new String[]{ clientProject } );
-	projectCombo_.select(0);
-  }
-  
-  public void setSampleProjectEAR(String clientProjectEAR) 
-  {
-    earCombo_.setItems( new String[]{ clientProjectEAR } );
-    earCombo_.select(0);
-  }
-  
-  public String getFolder()
-  {
-    return sampleFolderText_.getText();
-  }
-  
-  public void setFolder( String folder )
-  {
-    sampleFolderText_.setText( folder );
-  }
-  
-  public boolean getIsTestWidget()
-  {
-  	return isTestWidget;
-  }
-  
-  public void setJspFolder( String folder )
-  {
-    jspFolderText_.setText( folder );
-  }
-  
-  public void setLaunchedServiceTestName (String launchedServiceTestName)
-  {
-  	this.launchedServiceTestName = launchedServiceTestName;
-  }
-  
-  public boolean getRunClientTest()
-  {
-    return runTestCheckbox_.getSelection();
-  }
-  
-  public void setRunClientTest( boolean value )
-  {
-    runTestCheckbox_.setSelection( value );
-  }
-  
-  public BooleanSelection[] getMethods()
-  {
-    TreeItem[]         items   = methodsTree_.getItems();
-    BooleanSelection[] methods = new BooleanSelection[items.length];
-    
-    for( int index = 0; index < items.length; index++ )
-    {
-      methods[index] = new BooleanSelection( items[index].getText(), items[index].getChecked() );
-    }
-    
-    return methods;
-  }
-  
-  public void setMethods( BooleanSelection[] methods )
-  {
-    methodsTree_.removeAll();
-    
-    for( int index = 0; index < methods.length; index++ )
-    {
-      if(methods[index] == null)continue;
-      TreeItem item = new TreeItem( methodsTree_, SWT.NULL );
-      item.setText( methods[index].getValue() );
-      item.setChecked( methods[index].isSelected() );
-    }
-  }
-  
-  public void setInitialSelection( IStructuredSelection selection )
-  {
-    initialSelection_ = selection;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/CopyWebServiceUtilsJarCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/CopyWebServiceUtilsJarCommand.java
deleted file mode 100644
index 4d9fdff..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/CopyWebServiceUtilsJarCommand.java
+++ /dev/null
@@ -1,135 +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.consumption.ui.widgets.test;
-
-import org.eclipse.core.resources.IFile;
-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.core.runtime.Plugin;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.wst.command.env.common.FileResourceUtils;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.command.env.core.common.StatusHandler;
-import org.eclipse.wst.command.env.core.context.ResourceContext;
-import org.eclipse.wst.command.env.core.context.TransientResourceContext;
-
-
-public class CopyWebServiceUtilsJarCommand extends SimpleCommand {
-
-	private static java.lang.String DESCRIPTION = "Copy WebserviceUtils.jar";
-	private static java.lang.String LABEL           = "CopyWebserviceJarCommand";
-    private String sampleProject;
-    private MessageUtils msgUtils;
-	
-/**
- * Default CTOR;
- */
-
-
-public CopyWebServiceUtilsJarCommand()
-{
-  super(LABEL,DESCRIPTION);
-  String pluginId = "org.eclipse.jst.ws.consumption";
-  msgUtils = new MessageUtils(pluginId + ".plugin", this);  
-}
-
-/**
- * Execute the command
- */
-public Status execute(Environment env)
-{
-  try
-  {
-    env.getProgressMonitor().report( msgUtils.getMessage( "PROGRESS_INFO_COPY_WEBSERVICE_UTILS" ) );
-    IProject sampleIProject = (IProject)ResourceUtils.findResource(sampleProject);    
-//    IPath webModulePath = ResourceUtils.getWebModuleServerRoot(sampleIProject).getFullPath();
-    IPath webModulePath = J2EEUtils.getFirstWebContentPath(sampleIProject);	
-    if (webModulePath == null)
-      return new SimpleStatus(WebServiceConsumptionUIPlugin.ID,msgUtils.getMessage("MSG_ERROR_PROJECT_NOT_FOUND"), Status.ERROR);
-      
-    Status status = copyIFile("webserviceutils.jar",webModulePath,"WEB-INF/lib/webserviceutils.jar", WebServiceConsumptionPlugin.getInstance(),env);
-    if(status.getSeverity() == Status.ERROR){
-      StatusHandler sHandler = env.getStatusHandler();
-      Status errorStatus = new SimpleStatus("", msgUtils.getMessage("MSG_ERROR_FILECOPY_WEBSERVICE_UTILS"), Status.ERROR);
-      sHandler.reportError(errorStatus);	
-      return status;
-     }
-      
-      
-    }
-    catch (Exception e) {
-      StatusHandler sHandler = env.getStatusHandler();
-      Status errorStatus = new SimpleStatus("", msgUtils.getMessage("MSG_ERROR_FILECOPY_WEBSERVICE_UTILS"), Status.ERROR);
-      sHandler.reportError(errorStatus);	
-      return new SimpleStatus(WebServiceConsumptionUIPlugin.ID,msgUtils.getMessage("MSG_ERROR_FILECOPY_WEBSERVICE_UTILS"),Status.ERROR,e);
-    }
-  return new SimpleStatus("");
-}
-
-/**
- *
- */
-private Status copyIFile(String source, IPath targetPath, String targetFile,Environment env)
-{
-  return copyIFile(source, targetPath, targetFile, WebServicePlugin.getInstance(),env);
-}
-
-/**
- *
- */
-private Status copyIFile(String source, IPath targetPath, String targetFile, Plugin plugin,Environment env)
-{
-    
-  if (plugin != null)
-  {
-    IPath target = targetPath.append(new Path(targetFile));
-    
-    env.getProgressMonitor().report( msgUtils.getMessage( "PROGRESS_INFO_COPYING_FILE" ) );
-    try
-    {
-       ResourceContext context = new TransientResourceContext();
-       context.setOverwriteFilesEnabled(true);
-       context.setCreateFoldersEnabled(true);
-       context.setCheckoutFilesEnabled(true);
-       IResource resource = FileResourceUtils.findResource(target);
-       if(resource != null) return new SimpleStatus("");
-       IFile file = FileResourceUtils.createFile(context, 
-       								target,
-                                      plugin.openStream(new Path(source)),
-                                      env.getProgressMonitor(),
-                                      env.getStatusHandler());
-    }
-    catch (Exception e) {
-      return new SimpleStatus(WebServiceConsumptionUIPlugin.ID,msgUtils.getMessage("MSG_ERROR_FILECOPY_WEBSERVICE_UTILS"),Status.ERROR,e);
-    }
-  }
-  return new SimpleStatus("");
-}
-
-public void setSampleProject(String sampleProject)
-{
-  this.sampleProject = sampleProject;  
-}
-
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/CreateSampleProjectCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/CreateSampleProjectCommand.java
deleted file mode 100644
index 4ef2212..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/CreateSampleProjectCommand.java
+++ /dev/null
@@ -1,89 +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.consumption.ui.widgets.test;
-
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.jst.ws.internal.consumption.command.common.CreateWebProjectCommand;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.server.core.IServer;
-
-public class CreateSampleProjectCommand extends SimpleCommand
-{
-  private String sampleProject;
-  private String sampleProjectEar;
-  private IServer existingServer;
-  private String serverFactoryId;
-  private boolean needEAR;
-  private String j2eeVersion;
-  
-  
-  public CreateSampleProjectCommand()
-  {
-    super("org.eclipse.jst.ws.internal.consumption.ui.wizard.client.common.CreateSampleProjectCommand","org.eclipse.jst.ws.internal.consumption.ui.wizard.client.common.CreateSampleProjectCommand");
-  }
-
-  public Status execute(Environment env)
-  {
-    IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-    if (!root.getProject(sampleProject).exists() || !root.getProject(sampleProjectEar).exists())
-    {
-      CreateWebProjectCommand c = new CreateWebProjectCommand();
-      c.setProjectName(sampleProject);
-      c.setEarProjectName(sampleProjectEar);
-      c.setExistingServer(existingServer);
-      c.setServerFactoryId(serverFactoryId);
-      c.setNeedEAR(needEAR);
-      c.setJ2EEVersion(j2eeVersion);
-      return c.execute(env);
-    }
-    return new SimpleStatus("");
-  }
-
-  public void setSampleProject(String sampleProject)
-  {
-    this.sampleProject = sampleProject; 	
-  }
-
-  public void setSampleProjectEAR(String sampleProjectEar)
-  {
-  	this.sampleProjectEar = sampleProjectEar;
-  }
-
-  public void setExistingServer(IServer existingServer) {
-
-    this.existingServer = existingServer;
-  }
-  
-  public void setServerFactoryId(String serverFactoryId)
-  {
-  	this.serverFactoryId = serverFactoryId;
-  }
-
-  /**
-   * @param needEAR The needEAR to set.
-   */
-  public void setNeedEAR(boolean needEAR)
-  {
-    this.needEAR = needEAR;
-  }
-    
-  /**
-   * @param version The j2eeVersion to set.
-   */
-  public void setJ2eeVersion(String version)
-  {
-    j2eeVersion = version;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/FinishDefaultCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/FinishDefaultCommand.java
deleted file mode 100644
index aaaed6c..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/FinishDefaultCommand.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.consumption.ui.widgets.test;
-
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-
-
-/*
-* The JSPGeneration task runs the jsp generation engine found in the 
-* JBWizard Plugin
-*
-*
-*/
-public class FinishDefaultCommand extends SimpleCommand
-{
-  private String LABEL = "JSPGenerationTask";
-  private String DESCRIPTION = "Run the JSP Generation";
-  
-  private String sampleServerTypeID;
-  private IServer sampleExistingServer;
-  private String existingServerId_;
-  private TypeRuntimeServer clientIds;
-
-  
-  public FinishDefaultCommand ()
-  {
-    setDescription(DESCRIPTION);
-    setName(LABEL);  
-  }
-
-  public Status execute(Environment env)
-  {
-  	Status status = new SimpleStatus( "" );
-  	if(clientIds != null){
-  	  if (clientIds.getServerInstanceId() != null) 
-        sampleExistingServer = ServerCore.findServer(clientIds.getServerInstanceId());
-  	  if (sampleExistingServer==null && existingServerId_!=null && existingServerId_.length()>0)
-  	  {
-  	    //Use the existingServerId
-  	    sampleExistingServer = ServerCore.findServer(existingServerId_);
-  	  }
-      if (sampleExistingServer != null)
-        sampleServerTypeID = sampleExistingServer.getServerType().getId();
-      else
-        sampleServerTypeID = clientIds.getServerId();
-  	}
-    return status;
-  
-  }
-  
-  public void setClientTypeRuntimeServer(TypeRuntimeServer ids)
-  {
-    clientIds = ids;
-  }
-  
-  public String getSampleServerTypeID()
-  {
-  	return sampleServerTypeID;
-  }
-  
-  public IServer getSampleExistingServer()
-  {
-  	return sampleExistingServer;
-  }
-
-  public void setExistingServerId(String existingServerId)
-  {
-    existingServerId_ = existingServerId;
-  }  
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/FinishJavaTestFragment.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/FinishJavaTestFragment.java
deleted file mode 100644
index 4a8d3f7..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/FinishJavaTestFragment.java
+++ /dev/null
@@ -1,65 +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 May 4, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.test;
-
-import org.eclipse.jst.ws.internal.consumption.command.common.BuildProjectCommand;
-import org.eclipse.wst.command.env.core.common.Condition;
-import org.eclipse.wst.command.env.core.fragment.BooleanFragment;
-import org.eclipse.wst.command.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.env.core.fragment.SimpleFragment;
-
-
-/**
- * @author gilberta
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class FinishJavaTestFragment extends BooleanFragment 
-{
-  private boolean generateProxy;
-	
-  public FinishJavaTestFragment()
-  {
-  	SequenceFragment javaTestRoot = new SequenceFragment();
-  	Condition condition = new Condition()
-	{
-	  public boolean evaluate()
-	  {
-	    return generateProxy; 
-	  }
-	};
-    setCondition(condition);
-    javaTestRoot.add(new SimpleFragment(new TestClientDepartureInitCommand(), ""));
-    javaTestRoot.add(new SimpleFragment(new AddModuleDependenciesCommand(), ""));
-    javaTestRoot.add(new SimpleFragment(new BuildProjectCommand(), ""));
-    setTrueFragment(javaTestRoot);
-  }
-
-  public void setGenerateProxy(boolean generateProxy)
-  {
-  	this.generateProxy = generateProxy;
-  }
-  
-  public void setIsJSPGen(boolean jspGen)
-  {
-  	
-  }
-  
-  
-  
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/FinishTestFragment.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/FinishTestFragment.java
deleted file mode 100644
index 9dfd0aa..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/FinishTestFragment.java
+++ /dev/null
@@ -1,106 +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 May 4, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.test;
-
-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.env.core.common.Condition;
-import org.eclipse.wst.command.env.core.fragment.BooleanFragment;
-
-
-/**
- * @author gilberta
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class FinishTestFragment extends BooleanFragment{
-
-  private boolean isTestWidget;	
-  private boolean launchedTest;
-  private boolean generateProxy;
-  private String launchedServiceTestName;
-  private boolean testService;
-  private String testID;
-  public FinishTestFragment()
-  {
-    Condition condition = new Condition()
-	{
-	  public boolean evaluate()
-	  {
-	    if(!testService) return false;
-	  	if(launchedServiceTestName == null) return true;
-	    if(launchedServiceTestName != null)
-	      if((!launchedServiceTestName.equals("") &&  (!isPreferedAWSDLTest() || (isTestWidget && isClientTestJava())) && generateProxy) || launchedServiceTestName.equals("")) return true;	
-	    
-	  	return false; 
-	  }
-	};
-	   
-	setTrueFragment(new WebServiceTestClientDepartureFragment());
-    setCondition(condition);
-  }
-	    
-  public void setLaunchedServiceTestName(String launchedServiceTestName)
-  {
-	this.launchedServiceTestName = launchedServiceTestName;
-  }
-	  
-  public boolean isPreferedAWSDLTest()
-  {
-    ScenarioContext scenarioContext = WebServicePlugin.getInstance().getScenarioContext().copy();
-	String[] testTypes = scenarioContext.getWebServiceTestTypes();
-	WebServiceTestRegistry wsttRegistry = WebServiceTestRegistry.getInstance();
-	WebServiceTestExtension wscte = (WebServiceTestExtension)wsttRegistry.getWebServiceExtensionsByName(testTypes[0]);  	
-	if(!wscte.isJava())	
-	  return true;
-	return false;
-  }
-
-  public boolean isClientTestJava()
-  {
-  	if(testID == null) return false;
-  	WebServiceTestRegistry wsttRegistry = WebServiceTestRegistry.getInstance();
-	WebServiceTestExtension wscte = (WebServiceTestExtension)wsttRegistry.getWebServiceExtensionsByName(testID);  	
-	if(wscte.isJava())	
-      return true;
-    return false;   	
-  }
-  
-  
-  public void setTestService(boolean testService)
-  {
-    this.testService = testService;	 
-  }
-
-  public void setGenerateProxy(boolean generateProxy)
-  {
-    this.generateProxy = generateProxy;	 
-  }
-
-  public void setTestID(String testID)
-  {
-    this.testID = testID;
-  }
-
-  public void setIsTestWidget(boolean isTestWidget)
-  {
-  	this.isTestWidget = isTestWidget;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/TestClientDepartureInitCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/TestClientDepartureInitCommand.java
deleted file mode 100644
index b75ee1f..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/TestClientDepartureInitCommand.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
- *******************************************************************************/
-/*
- * Created on Mar 25, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.test;
-
-import org.eclipse.wst.command.env.core.SimpleCommand;
-
-/**
- * @author gilberta
- *
- * To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-public class TestClientDepartureInitCommand extends SimpleCommand 
-{
-  
-  private boolean forceBuild;	
-	
-  public TestClientDepartureInitCommand()
-  {
-  	forceBuild = true;
-  }
-
-  public boolean getForceBuild()
-  {
-  	return forceBuild;
-  }
-  
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/TestDefaultingFragment.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/TestDefaultingFragment.java
deleted file mode 100644
index 4d7095a..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/TestDefaultingFragment.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
- *******************************************************************************/
-/*
- * Created on May 4, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.test;
-
-import org.eclipse.jst.ws.internal.context.ScenarioContext;
-import org.eclipse.jst.ws.internal.ext.test.WebServiceTestRegistry;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.command.env.core.selection.SelectionList;
-
-
-/**
- * @author gilberta
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class TestDefaultingFragment extends SimpleCommand
-{
-  
-  private WebServiceTestRegistry testRegistry;
-  private SelectionList testFacilities;
-  private String launchedServiceTestName;
-  private ScenarioContext scenarioContext;	
-  
-  
-  public Status execute(Environment env)
-  {
-  	SimpleStatus status = new SimpleStatus("");
-  	
-  	scenarioContext = WebServicePlugin.getInstance().getScenarioContext().copy();
-  	//  test facilities
-    selectTestFacility();
-    return status;
-  }
-	
-  // The test facilities retrieved from the extension
-  // plus the default
-  public SelectionList getTestFacility()
-  {
-    return testFacilities;
-  } 
-	  
-  
-  
-  //	*********************** 
-  // This method uses the preference to 
-  // select the correct test facility 
-  // 
-  //***********************
-  private void selectTestFacility()
-  {
-    //if we find something we launched earlier 
-    //put it on the bottom
-    String[] testTypes = scenarioContext.getWebServiceTestTypes();	  
-    String[] newTestTypes = new String[testTypes.length];
-    boolean launched = false;
-    int j = 0;
-    for(int i = 0;i<testTypes.length;i++){
-	  if(testTypes[i].equals(launchedServiceTestName))
-	    launched = true;
-	  else{
-	     newTestTypes[j] = testTypes[i];
-	     j++;
-	  }
-	}
-	   	
-    if(launched)
-	  newTestTypes[testTypes.length - 1] = launchedServiceTestName;
-	  	
-    testFacilities = new SelectionList(newTestTypes,0);	
-  }
-
-  public void setLaunchedServiceTestName(String launchedServiceTestName)
-  {
-  	this.launchedServiceTestName = launchedServiceTestName;
-  }
-  
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WSDLFinishFragment.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WSDLFinishFragment.java
deleted file mode 100644
index 170dd17..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WSDLFinishFragment.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
- *******************************************************************************/
-/*
- * Created on May 4, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.test;
-
-import org.eclipse.wst.command.env.core.fragment.BooleanFragment;
-
-/**
- * @author gilberta
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class WSDLFinishFragment extends BooleanFragment{
-  
- 
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WSDLTestLaunchCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WSDLTestLaunchCommand.java
deleted file mode 100644
index fbcb106..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WSDLTestLaunchCommand.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 Eclipse Public License v1.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 May 4, 2004
- *
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.test;
-
-import java.util.List;
-
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.jst.ws.internal.ext.WebServiceExecutable;
-import org.eclipse.jst.ws.internal.ext.test.WSDLTestFinishCommand;
-import org.eclipse.jst.ws.internal.ext.test.WebServiceTestExtension;
-import org.eclipse.jst.ws.internal.ext.test.WebServiceTestRegistry;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.command.env.core.common.StatusHandler;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-
-/**
- * @author gilberta
- *
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class WSDLTestLaunchCommand extends SimpleCommand
-{
-  private String testID; 
-  private String launchedServiceTestName;
-  private TypeRuntimeServer serviceids;
-  private String serverProject;
-  private String wsdlURI;
-  private MessageUtils msgUtils;
-  private boolean externalBrowser;
-  private List endpoints;
-	
-  public WSDLTestLaunchCommand()
-  {
-  	String pluginId = "org.eclipse.jst.ws.consumption.ui";
-	msgUtils = new MessageUtils(pluginId + ".plugin", this);  	
-  }
-  
-  public Status execute(Environment env)
-  {
-  	Status status = new SimpleStatus("");
-  	IServer serviceExistingServer = null;
-  	String serviceServerTypeID = null;
-  	WebServiceTestRegistry testRegistry = WebServiceTestRegistry.getInstance();
-  	WebServiceTestExtension wscte = (WebServiceTestExtension)testRegistry.getWebServiceExtensionsByName(testID);
-    WebServiceExecutable wse = wscte.getWebServiceExecutableExtension();
-  	WSDLTestFinishCommand command = (WSDLTestFinishCommand)wse.getFinishCommand();
-  	launchedServiceTestName = wscte.getName();
-  	
-    //get the server stuff
-  	if (serviceids.getServerInstanceId() != null) 
-      serviceExistingServer = ServerCore.findServer(serviceids.getServerInstanceId());
-    if (serviceExistingServer != null)
-      serviceServerTypeID = serviceExistingServer.getServerType().getId();
-    else
-      serviceServerTypeID = serviceids.getServerId();
-      // server will be created in ServerDeployableConfigurationCommand
-  	
-  	command.setServerTypeID(serviceServerTypeID);
-    command.setServiceProject(serverProject);
-    command.setWsdlServiceURL(wsdlURI);
-    command.setExternalBrowser(externalBrowser);  
-    command.setEndpoint(endpoints);
-    status = command.execute(env);
-    
-    //Dont need to shut everything down because the wsdl test doesnt work
-    if(status.getSeverity() != Status.OK){
-      StatusHandler sHandler = env.getStatusHandler();
-      Status infoStatus = new SimpleStatus("", msgUtils.getMessage("MSG_ERROR_UNABLE_TO_LAUNCH_WSDL_TEST"), Status.INFO);
-      sHandler.reportInfo(infoStatus);
-      return infoStatus;	
-    }
-   return status;
-  	
-  }
-
-  public void setTestID(String testID)
-  {
-  	this.testID = testID;
-  }
-
-  public String getLaunchedServiceTestName()
-  {
-    return launchedServiceTestName;	
-  }
-  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 void setExternalBrowser(boolean externalBrowser)
-  {
-  	this.externalBrowser = externalBrowser;
-  }
-  
-  public void setEndpoint(List endpoints)
-  {
-    this.endpoints = endpoints;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WebServiceClientTestArrivalCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WebServiceClientTestArrivalCommand.java
deleted file mode 100644
index 6b74075..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WebServiceClientTestArrivalCommand.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.consumption.ui.widgets.test;
-
-import java.util.List;
-import java.util.ListIterator;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.jst.ws.internal.consumption.command.common.JavaMofReflectionCommand;
-import org.eclipse.jst.ws.internal.context.ScenarioContext;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.jst.ws.internal.ext.test.WebServiceTestRegistry;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.command.env.core.common.StatusHandler;
-import org.eclipse.wst.command.env.core.selection.BooleanSelection;
-import org.eclipse.wst.command.env.core.selection.SelectionList;
-import org.eclipse.wst.command.env.core.selection.SelectionListChoices;
-import org.eclipse.wst.server.core.IServer;
-
-
-/**
-* This task sets up all the defaults for the webservice test
-* client page
-*
-*/
-public class WebServiceClientTestArrivalCommand extends SimpleCommand
-{
-  public static final String DEFAULT_WEB_MODULE_ROOT = "WebContent";
-  public static final String DEFAULT_SAMPLE_WEB_PROJECT_EXT = "Sample";
-  public static final String DEFAULT_SAMPLE_EAR_PROJECT_EXT = "EAR";
-
-  private String LABEL = "WebServiceClientTestArrivalTask";
-  private String DESCRIPTION = "default actions";
-  private MessageUtils msgUtils;
-  public static String SAMPLE_DIR = "sample";
-  public String SET_ENDPOINT = "setEndPoint(java.net.URL)";
-  public String GET_ENDPOINT = "getEndPoint()";
-
-  private String PROXY = "Proxy";
-
-  private ScenarioContext scenarioContext;
- 
-  
-  private String clientProject;
-  private IProject clientIProject;
-  private String clientProjectEAR;
-  private String sampleServerTypeID;
-  private IServer sampleExistingServer;
-  private WebServiceTestRegistry testRegistry;
-  private SelectionList testFacilities;
-  private String folder;
-  private String jspFolder;
-  private BooleanSelection[] methods;
-  private String proxyBean;
-  private SelectionListChoices runtime2ClientTypes;
-  private String sampleProject;
-  private String sampleEAR;
-  private TypeRuntimeServer clientIds;
-  private String j2eeVersion;
-
-  private String launchedServiceTestName;
-  private boolean runClientTest=true;
-  
-  /**
-  * Constructs a new WebServiceClientTestArrivalTask object with the given label and description.
-  */
-  public WebServiceClientTestArrivalCommand ()
-  {
-  	setDescription(DESCRIPTION);
-  	setName(LABEL);
-  	String pluginId = "org.eclipse.jst.ws.consumption.ui";
-	msgUtils = new MessageUtils(pluginId + ".plugin", this);  	
-    
-    scenarioContext = WebServicePlugin.getInstance().getScenarioContext().copy();
-  	testRegistry = WebServiceTestRegistry.getInstance();
-  }
-
-  public Status execute(Environment env)
-  {
-  	Status status = new SimpleStatus( "" );
-  	sampleProjectAndEarSetup();
-  	
-    //Get the sample Folder ready
-    StringBuffer sb = new StringBuffer();
-    sb.append("/").append(sampleProject).append("/").append(DEFAULT_WEB_MODULE_ROOT).append("/");
-    folder = SAMPLE_DIR + getBean(); 
-        
-    sb.append(folder);
-    jspFolder = sb.toString();
-    
-    //get the method names ready
-    //find the full path of the file in the project
-    /*
-    * Getting the method names using javamof introspection
-    */
-    if(proxyBean == null){
-      StatusHandler sHandler = env.getStatusHandler();
-      Status errorStatus = new SimpleStatus("", msgUtils.getMessage("MSG_ERROR_JTS_PROXY_NOT_COMPILED"), Status.ERROR);
-      sHandler.reportError(errorStatus);
-      return errorStatus;
-      
-    } 	
-    
-    
-    JavaMofReflectionCommand javamofcommand = new JavaMofReflectionCommand(); 
-    javamofcommand.setProxyBean(proxyBean);
-    javamofcommand.setClientProject(clientProject);
-    
-    
-    
-    try{ 
-      Status mofStatus = javamofcommand.execute(env);
-      if(mofStatus.getSeverity() == Status.ERROR)
-      	return mofStatus;
-    }catch(Exception exc){
-    	StatusHandler sHandler = env.getStatusHandler();
-        Status errorStatus = new SimpleStatus("", msgUtils.getMessage("MSG_ERROR_JTS_PROXY_NOT_COMPILED"), Status.ERROR);
-        sHandler.reportError(errorStatus);
-        return errorStatus;
-    }  
-    JavaHelpers javaHelpers = javamofcommand.getJavaClass();
-    if (javaHelpers == null) return status;
-      
-    JavaClass javaClass = null; 
-    if(javaHelpers instanceof JavaClass) 
-     javaClass = (JavaClass)javaHelpers; 
-    else return status; 
-    List methodList = javaClass.getPublicMethods();
- 	BooleanSelection[] tempMethods = new BooleanSelection[methodList.size()];
-    ListIterator listIterator = methodList.listIterator();
-    
-    int j = 0;
- 	while (listIterator.hasNext())
-    {
-      Method method = (Method)listIterator.next();
-      if(method.isConstructor()) continue;
-      String signature = method.getMethodElementSignature();
-      
-      tempMethods[j] = new BooleanSelection( method.getMethodElementSignature(), true);      
-      j++;
-    } 
-    methods = tempMethods;
-    return status;
-  }
- 
-  /**
-  * Helper method which sets up project stuff
-  *
-  */
-  private String getClientProjectFolder()
-  {
-     	
-  	//First the inital part of the path is project related
-    String javaSourceLocation = "";
-    if (clientProject != null) {
-      IPath javaSourcePath = ResourceUtils.getJavaSourceLocation((IProject)clientIProject);
-      if (javaSourcePath != null)
-      	javaSourceLocation = javaSourcePath.toString();
-      else {
-        javaSourceLocation = "/"+clientIProject.getName() + "/Java Source";  // to be updated by Web Tooling API
-      }
-    }
-    return javaSourceLocation;
-
-  }
-  public static String WEBID = "org.eclipse.jst.ws.consumption.ui.clientProjectType.Web"; 
-  public static String EJBID = "org.eclipse.jst.ws.consumption.ui.clientProjectType.EJB";
-  public static String APPCLIENT = "org.eclipse.jst.ws.consumption.ui.clientProjectType.AppClient";
-  
-  
-  private void sampleProjectAndEarSetup()
-  {
-  	clientIProject = (IProject)ResourceUtils.findResource(clientProject);
-  	//move to the web level
-  	SelectionListChoices slc = runtime2ClientTypes.getChoice();
-  	String projectType = slc.getList().getSelection();
-  	if(projectType.equals(WEBID)){
-      sampleProject = slc.getChoice().getList().getSelection();
-  	}  	
-  	else{ 
-  	  sampleProject = (new StringBuffer(clientIProject.getName())).append(DEFAULT_SAMPLE_WEB_PROJECT_EXT).toString();	
-  	}
-  	sampleEAR = slc.getChoice().getChoice().getList().getSelection();
-  	if (sampleEAR == null || sampleEAR.length()==0)
-  	{
-  	  //Create a default name if an EAR is needed.
-		//Use the server type
-		String targetId = ServerUtils.getRuntimeTargetIdFromFactoryId(clientIds.getServerId());
-		if (targetId!=null && targetId.length()>0)
-		{
-		  if (ServerUtils.isTargetValidForEAR(targetId,j2eeVersion))
-	  	  {
-		    sampleEAR = (new StringBuffer(sampleProject)).append(DEFAULT_SAMPLE_EAR_PROJECT_EXT).toString();
-	  	  }
-		}  	  
-  	}
-  }
-    
-  //getters and setters
-  
-  private String getBean()
-  {
-  	int index = proxyBean.lastIndexOf(".");
-  	String end = "";
-  	if(index != -1){
-  	  end = proxyBean.substring(index + 1);  	
-  	}
-  	String bean = end.substring(0,end.length());
-    
-  	return bean;
-  }
-  
-  
-  public boolean getRunClientTest()
-  {
-  	return runClientTest;
-  }
-  
-  public String getFolder()
-  {
-  	return folder;
-  }
-  
-  public String getJspFolder()
-  {
-  	return jspFolder;
-  }
-  
-  public BooleanSelection[] getMethods()
-  {
-    return methods;  
-  }
-    
-  public String getSampleProjectEAR()
-  {
-  	return sampleEAR;
-  }
-  
-  public String getSampleProject()
-  {
-  	return sampleProject;
-  }
-       
-  public void setClientProject(String clientProject)
-  {
-    this.clientProject = clientProject;
-  }
-  
-  public void setProxyBean(String proxyBean)
-  {
-  	this.proxyBean = proxyBean;
-  }
-  
-  public String getProxyBean()
-  {
-    return proxyBean;
-  }
-
-  public void setClientProjectEAR(String clientProjectEAR)
-  {
-    this.clientProjectEAR = clientProjectEAR;
-  }	
-  
-  public void setRuntime2ClientTypes( SelectionListChoices selectionList )
-  {
-    runtime2ClientTypes = selectionList;  
-  }
-
-  public void setLaunchedServiceTestName(String launchedServiceTestName)
-  {
-  	this.launchedServiceTestName = launchedServiceTestName;
-  }
-  /**
-   * @param clientIds The clientIds to set.
-   */
-  public void setClientIds(TypeRuntimeServer clientIds)
-  {
-    this.clientIds = clientIds;
-  }
-  
-  /**
-   * @param version The j2eeVersion to set.
-   */
-  public void setJ2eeVersion(String version)
-  {
-    j2eeVersion = version;
-  }  
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WebServiceTestClientDepartureFragment.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WebServiceTestClientDepartureFragment.java
deleted file mode 100644
index 795e7b4..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WebServiceTestClientDepartureFragment.java
+++ /dev/null
@@ -1,51 +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 Mar 25, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.test;
-
-import org.eclipse.jst.ws.internal.consumption.command.common.BuildProjectCommand;
-import org.eclipse.wst.command.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.env.core.fragment.SimpleFragment;
-
-
-/**
- * @author gilberta
- *
- * To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-public class WebServiceTestClientDepartureFragment extends SequenceFragment 
-{
-  public WebServiceTestClientDepartureFragment()
-  {
-  	add(new SimpleFragment(new FinishDefaultCommand(),""));
-  	add(new FinishJavaTestFragment());
-  	add(new SimpleFragment(new ClientTestDelegateCommand(),""));
-  }
-
-  public void registerDataMappings(DataMappingRegistry dataRegistry)
-  {
-  	dataRegistry.addMapping(TestClientDepartureInitCommand.class, "ForceBuild",BuildProjectCommand.class);
-  	dataRegistry.addMapping(FinishDefaultCommand.class, "SampleServerTypeID",AddModuleDependenciesCommand.class);
-  	dataRegistry.addMapping(FinishDefaultCommand.class, "SampleExistingServer",AddModuleDependenciesCommand.class);
-  	dataRegistry.addMapping(FinishDefaultCommand.class, "SampleServerTypeID",ClientTestDelegateCommand.class);
-  	dataRegistry.addMapping(FinishDefaultCommand.class, "SampleExistingServer",ClientTestDelegateCommand.class);
-  	dataRegistry.addMapping(AddModuleDependenciesCommand.class, "sampleProject",BuildProjectCommand.class);
-    
-  }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/ExplorerServiceTestCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/ExplorerServiceTestCommand.java
deleted file mode 100644
index d8ccd30..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/ExplorerServiceTestCommand.java
+++ /dev/null
@@ -1,111 +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.consumption.ui.widgets.test.explorer;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.command.common.StartProjectCommand;
-import org.eclipse.jst.ws.internal.ext.test.WSDLTestFinishCommand;
-import org.eclipse.jst.ws.internal.explorer.LaunchOption;
-import org.eclipse.jst.ws.internal.explorer.LaunchOptions;
-import org.eclipse.jst.ws.internal.explorer.WSExplorerLauncherCommand;
-import org.eclipse.jst.ws.internal.explorer.plugin.ExplorerPlugin;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.server.core.IServer;
-
-public class ExplorerServiceTestCommand extends SimpleCommand implements WSDLTestFinishCommand
-{
-
-  private String LABEL = "ExplorerServiceTestCommand";
-  private String DESCRIPTION = "Launch the Explorer";
-  private boolean externalBrowser = true;
-  private String wsdlServiceURL;
-  private String serviceServerTypeID;
-  private IServer serviceExistingServer;
-  private String serviceProject;
-  private List endpoints;
-  
-  /**
-  * Constructs a new WebServiceExplorerLaunch object with the given label and description.
-  */
-  public ExplorerServiceTestCommand ()
-  {
-  	setDescription(DESCRIPTION);
-  	setName(LABEL);
-  }
-
-  public Status execute(Environment env)
-  {
-  	Status status = new SimpleStatus( "" );
-    
-    StartProjectCommand spc = new StartProjectCommand( true );
-    spc.setServiceServerTypeID(serviceServerTypeID);
-    spc.setServiceExistingServer(serviceExistingServer);
-    IProject project = (IProject) ResourceUtils.findResource(serviceProject);
-    spc.setServiceProject(project);
-    spc.setIsWebProjectStartupRequested(true);
-    
-    status = spc.execute(env);
-    if (status.getSeverity() == Status.ERROR)
-    	return status;
-
-    WSExplorerLauncherCommand launchCommand = new WSExplorerLauncherCommand();
-    launchCommand.setForceLaunchOutsideIDE(externalBrowser);
-    Vector launchOptionVector = new Vector();
-	String stateLocation = ExplorerPlugin.getInstance().getPluginStateLocation();
-	launchOptionVector.add(new LaunchOption(LaunchOptions.STATE_LOCATION,stateLocation));
-    launchOptionVector.add(new LaunchOption(LaunchOptions.WSDL_URL,wsdlServiceURL));
-    if (endpoints != null)
-      for (Iterator it = endpoints.iterator(); it.hasNext();)
-        launchOptionVector.add(new LaunchOption(LaunchOptions.WEB_SERVICE_ENDPOINT, it.next().toString()));
-    launchCommand.setLaunchOptions((LaunchOption[])launchOptionVector.toArray(new LaunchOption[0]));
-    status = launchCommand.execute(env);
-    return status;
-  }
-
-  public void setExternalBrowser(boolean externalBrowser)
-  {
-  	this.externalBrowser = externalBrowser;
-  }
-  
-  public void setWsdlServiceURL(String wsdlServiceURL)
-  {
-  	this.wsdlServiceURL = wsdlServiceURL;
-  }
-  
-  public void setServerTypeID(String serviceServerTypeID)
-  {
-  	this.serviceServerTypeID = serviceServerTypeID;
-  }
-  
-  public void setExistingServer(IServer serviceExistingServer)
-  {
-  	this.serviceExistingServer = serviceExistingServer;
-  }
-  
-  public void setServiceProject(String serviceProject)
-  {
-    this.serviceProject = serviceProject;
-  }
-  
-  public void setEndpoint(List endpoints)
-  {
-    this.endpoints = endpoints;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/WebServiceExplorerExecutable.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/WebServiceExplorerExecutable.java
deleted file mode 100644
index 22b35f6..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/WebServiceExplorerExecutable.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 Eclipse Public License v1.0
- * which accompanies 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.consumption.ui.widgets.test.explorer;
-
-import org.eclipse.jst.ws.internal.ext.WebServiceExecutable;
-import org.eclipse.jst.ws.internal.ext.WebServiceFinishCommand;
-
-/**
-* This is the interface for objects that represent a kind of
-* Web Service-Server-Runtime artifact. The primary purpose of a WebServiceServerRuntimeType
-* object is to manufacture the wizard pages that support the type, server, and runtime configuration.
-*/
-public class WebServiceExplorerExecutable implements WebServiceExecutable
-{
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-   
-  
-  public WebServiceFinishCommand getFinishCommand()
-  {
-    return new ExplorerServiceTestCommand();
-  }
-  
-}
-
-
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/WSSampleFinishCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/WSSampleFinishCommand.java
deleted file mode 100644
index 14b85ef..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/WSSampleFinishCommand.java
+++ /dev/null
@@ -1,309 +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.consumption.ui.widgets.test.wssample;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.ws.internal.common.EnvironmentUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.command.common.PublishProjectCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.StartProjectCommand;
-import org.eclipse.jst.ws.internal.consumption.sampleapp.codegen.InputFileGenerator;
-import org.eclipse.jst.ws.internal.consumption.sampleapp.codegen.MethodFileGenerator;
-import org.eclipse.jst.ws.internal.consumption.sampleapp.codegen.ResultFileGenerator;
-import org.eclipse.jst.ws.internal.consumption.sampleapp.codegen.TestClientFileGenerator;
-import org.eclipse.jst.ws.internal.consumption.sampleapp.command.GeneratePageCommand;
-import org.eclipse.jst.ws.internal.consumption.sampleapp.command.JavaToModelCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.CopyWebServiceUtilsJarCommand;
-import org.eclipse.jst.ws.internal.ext.test.JavaProxyTestCommand;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.Log;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.command.env.core.common.StatusException;
-import org.eclipse.wst.command.env.core.selection.BooleanSelection;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.internet.webbrowser.WebBrowser;
-
-public class WSSampleFinishCommand extends SimpleCommand implements JavaProxyTestCommand
-{
-
-  public static String INPUT       = "Input.jsp";
-  public static String TEST_CLIENT = "TestClient.jsp";
-  public static String RESULT      = "Result.jsp";
-  public static String METHOD      = "Method.jsp";
-
-  private static String LABEL = "JavaBeanToSampleActiveTask";
-  private static String DESCRIPTION = "default actions";
-  private MessageUtils msgUtils;
-  
-  private Model proxyModel;
-  private String sampleServerTypeID;
-  private IServer sampleExistingServer;
-  
-  
-  private String clientProject;
-  private String qname;
-  private String jspFolder;
-  private boolean runClientTest;
-  private String sampleProject;
-  private BooleanSelection[] methods;
-  private String proxyBean;
-  private String setEndpointMethod;
-  private List endpoints;
-  
-  /**
-  * Constructs a new JavaBeanToSampleActiveTask object with the given label and description.
-  */
-  public WSSampleFinishCommand ()
-  {
-	String pluginId = "org.eclipse.jst.ws.consumption.ui";
-	msgUtils = new MessageUtils(pluginId + ".plugin", this);
-	setDescription(DESCRIPTION);
-	setName(LABEL);  	
-  }
-
-  public Status execute(Environment env)
-  {
-  	Status status = new SimpleStatus( "" );
-    //setters and getters to be removed
-  	CopyWebServiceUtilsJarCommand copy = new CopyWebServiceUtilsJarCommand();    
-  	copy.setSampleProject(sampleProject);
-  	status = copy.execute(env);
-    if (status.getSeverity() == Status.ERROR) return status;
-    status = createModel(env);
-    if (status.getSeverity() == Status.ERROR) return status;
-    status = generatePages(env);
-    if (status.getSeverity() == Status.ERROR) return status;
-    //if (!isSuccessful()) return;
-    status = launchSample(env);
-    return status;   
-  }
-
-   
-  /**
-  * Generate the four jsps that make up this
-  * sample app.
-  */
-  protected Status generatePages(Environment env)
-  {
-  	Status status = new SimpleStatus( "" );
-    IPath fDestinationFolderPath = new Path(jspFolder);
-    fDestinationFolderPath = fDestinationFolderPath.makeAbsolute();    
-    IWorkspaceRoot fWorkspace = ResourcesPlugin.getWorkspace().getRoot();
-
-    IPath pathTest = fDestinationFolderPath.append(TEST_CLIENT);
-    IFile fileTest = fWorkspace.getFile(pathTest);
-    GeneratePageCommand gpcTest = new GeneratePageCommand(EnvironmentUtils.getResourceContext(env), proxyModel,
-      new TestClientFileGenerator(INPUT,METHOD,RESULT),fileTest);
-    //gpcTest.setStatusMonitor(getStatusMonitor());
-    status = gpcTest.execute(env);
-    if (status.getSeverity() == Status.ERROR )
-    	return status;
-    
-
-    //input codegen
-    IPath pathInput = fDestinationFolderPath.append(INPUT);
-    IFile fileInput = fWorkspace.getFile(pathInput);
-    InputFileGenerator inputGenerator = new InputFileGenerator(RESULT);
-    GeneratePageCommand gpcInput = new GeneratePageCommand(EnvironmentUtils.getResourceContext(env), proxyModel,
-      inputGenerator,fileInput);
-    //gpcInput.setStatusMonitor(getStatusMonitor());
-    status = gpcInput.execute(env);
-    if (status.getSeverity() == Status.ERROR )
-    	return status;
-
-    //method codegen
-    IPath pathMethod = fDestinationFolderPath.append(METHOD);
-    IFile fileMethod = fWorkspace.getFile(pathMethod);
-    MethodFileGenerator methodGenerator = new MethodFileGenerator(INPUT);
-    methodGenerator.setClientFolderPath(jspFolder);
-    GeneratePageCommand gpcMethod = new GeneratePageCommand(EnvironmentUtils.getResourceContext(env), proxyModel,
-      methodGenerator,fileMethod);
-    //gpcMethod.setStatusMonitor(getStatusMonitor());
-    status = gpcMethod.execute(env);
-    if (status.getSeverity() == Status.ERROR )
-    	return status;    
-
-
-    //result codegen
-    IPath pathResult = fDestinationFolderPath.append(RESULT);
-    IFile fileResult = fWorkspace.getFile(pathResult);
-    ResultFileGenerator rfg = new ResultFileGenerator();
-    rfg.setClientFolderPath(jspFolder);
-    rfg.setSetEndpointMethod(setEndpointMethod);
-    GeneratePageCommand gpcResult = new GeneratePageCommand(EnvironmentUtils.getResourceContext(env), proxyModel,
-      rfg,fileResult);
-    //gpcResult.setStatusMonitor(getStatusMonitor());
-    status = gpcResult.execute(env);
-    
-    return status;
-  }
-
-
-  protected Status launchSample (Environment env) {
-
-  	Status status = new SimpleStatus( "" );
-    if (!runClientTest) return status;
-    
-
-    IPath fDestinationFolderPath = new Path(jspFolder);
-    fDestinationFolderPath = fDestinationFolderPath.makeAbsolute();    
-
-    PublishProjectCommand ppc = new PublishProjectCommand();
-    ppc.setServerTypeID(sampleServerTypeID);
-    ppc.setExistingServer(sampleExistingServer);
-    ppc.setProject(sampleProject);
-    status = ppc.execute(env);
-
-    StartProjectCommand spc = new StartProjectCommand(false );
-    spc.setServiceServerTypeID(sampleServerTypeID);
-    spc.setSampleExistingServer(sampleExistingServer);
-    IProject project = (IProject) ResourceUtils.findResource(sampleProject);
-    spc.setSampleProject(project);
-    spc.setIsWebProjectStartupRequested(true);
-    
-    status = spc.execute(env);
-    if (status.getSeverity() == Status.ERROR) return status;
-    
-    IPath newPath = new Path(ResourceUtils.getWebProjectURL(ResourceUtils.getProjectOf(fDestinationFolderPath),sampleServerTypeID,sampleExistingServer));
-    newPath = newPath.append(fDestinationFolderPath.removeFirstSegments(2).makeAbsolute());
-    StringBuffer urlString = new StringBuffer(newPath.append(TEST_CLIENT).toString());
-    if (endpoints != null && !endpoints.isEmpty())
-    {
-      urlString.append("?endpoint=");
-      urlString.append(endpoints.get(0).toString());
-    }
-    
-    try{
-      URL url;
-      url = new URL(urlString.toString());
-      int style = WebBrowser.LOCATION_BAR | WebBrowser.BUTTON_BAR;  
-
-      for( int retries = 0; retries < 10; retries++ )
-      {
-        try
-        {
-          // Test the URLs
-          (new URL(newPath.append(RESULT).toString())).openStream();
-          (new URL(newPath.append(METHOD).toString())).openStream();
-          (new URL(newPath.append(INPUT).toString())).openStream();
-          (new URL(newPath.append(TEST_CLIENT).toString())).openStream();
-          // Looks good, exit loop
-          break;
-        }
-        catch( IOException ioe )
-        {
-          try
-          {
-            Thread.sleep(1000);
-          }
-          catch (InterruptedException ie) {} 	  	          
-        }
-      }
-
-      WebBrowser.openURL(url,style,null);
-      return status;  
-    }catch(MalformedURLException exc){
-    	env.getLog().log(Log.WARNING, 5048, this, "launchSample", exc);
-		status = new SimpleStatus( "launchSample", msgUtils.getMessage("MSG_ERROR_MALFORMED_URL"), Status.WARNING );
-		try {
-			env.getStatusHandler().report(status);
-		} catch (StatusException e) {
-			status = new SimpleStatus( "launchSample", msgUtils.getMessage("MSG_ERROR_MALFORMED_URL"), Status.ERROR );
-		}
-    	return status;
-    }
-  }
-
-  
-
-  protected Status createModel(Environment env) {
-
-  	//create the model from the resource
-    JavaToModelCommand jtmc = new JavaToModelCommand();
-    jtmc.setMethods(methods);
-    jtmc.setClientProject(clientProject);
-    jtmc.setProxyBean(proxyBean);
-    //jtmc.setStatusMonitor(getStatusMonitor());
-    Status status = jtmc.execute(env);
-    if (status.getSeverity() == Status.ERROR) return status;
-
-    proxyModel = jtmc.getDataModel();
-    return status;
-  }
-
-  public void setServerTypeID(String sampleServerTypeID)
-  {
-  	this.sampleServerTypeID = sampleServerTypeID;
-  }
-  
-  public void setExistingServer(IServer sampleExistingServer)
-  {
-  	this.sampleExistingServer = sampleExistingServer;
-  }
-  
-  public void setJspFolder(String jspFolder)
-  {
-    this.jspFolder = jspFolder;
-  }
-  
-  public void setRunClientTest(boolean runClientTest)
-  {
-  	this.runClientTest = runClientTest;
-  }
-  
-  public void setSampleProject(String sampleProject)
-  {
-  	this.sampleProject = sampleProject;
-  }
-
-  public void setClientProject(String clientProject)
-  {
-  	this.clientProject = clientProject;
-  }
-  
-  public void setMethods(BooleanSelection[] methods)
-  {
-  	this.methods = methods;
-  }
-
-  public void setProxyBean(String proxyBean)
-  {
-  	this.proxyBean = proxyBean;
-  }
-
-  /**
-   * @param setEndpointMethod The setEndpointMethod to set.
-   */
-  public void setSetEndpointMethod(String setEndpointMethod)
-  {
-    this.setEndpointMethod = setEndpointMethod;
-  }
-  
-  public void setEndpoint(List endpoints)
-  {
-    this.endpoints = endpoints;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/WebServiceWSSampleExecutable.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/WebServiceWSSampleExecutable.java
deleted file mode 100644
index bec3401..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/WebServiceWSSampleExecutable.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 Eclipse Public License v1.0
- * which accompanies 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.consumption.ui.widgets.test.wssample;
-
-import org.eclipse.jst.ws.internal.ext.WebServiceExecutable;
-import org.eclipse.jst.ws.internal.ext.WebServiceFinishCommand;
-
-/**
-* This is the interface for objects that represent a kind of
-* Web Service-Server-Runtime artifact. The primary purpose of a WebServiceServerRuntimeType
-* object is to manufacture the wizard pages that support the type, server, and runtime configuration.
-*/
-public class WebServiceWSSampleExecutable implements WebServiceExecutable
-{
-   
-  
-  public WebServiceFinishCommand getFinishCommand()
-  {
-  	return new WSSampleFinishCommand();
-  }
-    
-}
-
-
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/ClientProjectTypeRegistry.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/ClientProjectTypeRegistry.java
deleted file mode 100644
index 3f298ff..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/ClientProjectTypeRegistry.java
+++ /dev/null
@@ -1,137 +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.consumption.ui.wizard;
-
-import java.util.StringTokenizer;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-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.ResourceUtils;
-
-public class ClientProjectTypeRegistry
-{
-  private static ClientProjectTypeRegistry instance_;
-  private IConfigurationElement[] configElements_;
-
-  private ClientProjectTypeRegistry()
-  {
-    init();
-  }
-
-  /**
-  * Returns a singleton instance of this class.
-  * @return A singleton ClientProjectTypeRegistry object.
-  */
-  public static ClientProjectTypeRegistry getInstance()
-  {
-    if (instance_ == null)
-      instance_ = new ClientProjectTypeRegistry();
-    return instance_;
-  }
-
-  public void init()
-  {
-    IExtensionRegistry reg = Platform.getExtensionRegistry();
-    configElements_ = reg.getConfigurationElementsFor("org.eclipse.jst.ws.consumption.ui", "clientProjectType");
-  }
-
-  public IConfigurationElement getDefaultElement()
-  {
-    return getElementById("org.eclipse.jst.ws.consumption.ui.clientProjectType.Web");
-  }
-
-  public IConfigurationElement getElementById(String id)
-  {
-    return getElementByAttribute("id", id);
-  }
-
-  public IConfigurationElement getElementByLabel(String label)
-  {
-    return getElementByAttribute("label", label);
-  }
-
-  public IConfigurationElement getElementByProject(IProject project)
-  {
-    for (int i = 0; i < configElements_.length; i++)
-      if (include(project, configElements_[i].getAttribute("include")) && exclude(project, configElements_[i].getAttribute("exclude")))
-        return configElements_[i];
-    return null;
-  }
-
-  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;
-  }
-
-  public IProject[] getProjects(String id)
-  {
-    Vector v = new Vector();
-    IConfigurationElement element = getElementById(id);
-    if (element != null)
-    {
-      IProject[] workspaceProjs = ResourcesPlugin.getWorkspace().getRoot().getProjects();
-      for (int i = 0; i < workspaceProjs.length; i++) {
-		// TODO: Needs to be refactored to work with project/module topology described in XP
-        //if (include(workspaceProjs[i], element.getAttribute("include")) && exclude(workspaceProjs[i], element.getAttribute("exclude")))
-		if (ResourceUtils.isWebProject(workspaceProjs[i]) || ResourceUtils.isEJBProject(workspaceProjs[i]))
-		{
-          v.add(workspaceProjs[i]);
-        }
-      }
-    }
-    IProject[] projects = new IProject[v.size()];
-    v.copyInto(projects);
-    return projects;
-  }
-
-  private boolean include(IProject project, String include)
-  {
-    StringTokenizer st = new StringTokenizer(include);
-    while(st.hasMoreTokens())
-    {
-      try
-      {
-        if (project.hasNature(st.nextToken()))
-          return true;
-      }
-      catch (CoreException ce)
-      {
-      }
-    }
-    return false;
-  }
-
-  private boolean exclude(IProject project, String exclude)
-  {
-    StringTokenizer st = new StringTokenizer(exclude);
-    while(st.hasMoreTokens())
-    {
-      try
-      {
-        if (project.hasNature(st.nextToken()))
-          return false;
-      }
-      catch (CoreException ce)
-      {
-      }
-    }
-    return true;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/IWebServiceRuntime.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/IWebServiceRuntime.java
deleted file mode 100644
index 23c7d93..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/IWebServiceRuntime.java
+++ /dev/null
@@ -1,58 +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.consumption.ui.wizard;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-
-/**
-* This is the interface for objects that represent a kind of
-* Web Service artifact. 
-*/
-public interface IWebServiceRuntime
-{
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  /**
-  * Returns the id of this Web Service runtime.
-  * @return id of this Web Service runtime.
-  */
-  public String getId ();
-
-  /**
-  * Returns a locale specific description of this Web Service runtime.
-  * @return A locale specific description of this Web Service runtime.
-  */
-  public String getDescription ();
-
-  /**
-  * Returns a short, locale specific Label of this Web Service runtime.
-  * @return A short, locale specific Label of this Web Service runtime.
-  */
-  public String getLabel ();
-  
-  /**
-   * Returns a String, J2EE version
-   * @return
-   */
-  public String[] getJ2EEVersions();
-
-  /**
-   * Returns the configuration element associated with
-   * this runtime.
-   * 
-   * @return org.eclipse.core.runtime.IConfigurationElement
-   */
-  public IConfigurationElement getConfigurationElement();
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/IWebServiceServer.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/IWebServiceServer.java
deleted file mode 100644
index 580d960..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/IWebServiceServer.java
+++ /dev/null
@@ -1,63 +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.consumption.ui.wizard;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-
-/**
-* This is the interface for objects that represent a kind of
-* Web Service artifact. The primary purpose of a WebServiceType
-* object is to manufacture the wizard pages that support the type.
-*/
-public interface IWebServiceServer
-{
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  /**
-  * Returns the id of this Web Service type.
-  * @return id of this Web Service type.
-  */
-  public String getId ();
-  /**
-  * Returns a short, locale specific name of this Web Service type.
-  * @return A short, locale specific name of this Web Service type.
-  */
-  public String getFactoryId ();
-
-  /**
-  * Returns a short, locale specific name of this Web Service type.
-  * @return A short, locale specific name of this Web Service type.
-  */
-  public String getLabel ();
-  
-  /**
-   * Returns true if set true in plugin.xml
-   * @return boolean
-   */
-  public boolean getIsDefault();
-  
-  /**
-   * Returns runtime target Id
-   * @return String
-   */
-  public String getRuntimeTypeId();
-  
-  /**
-   * Returns the configuration element associated with
-   * this runtime.
-   * 
-   * @return org.eclipse.core.runtime.IConfigurationElement
-   */
-  public IConfigurationElement getConfigurationElement();
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/IWebServiceType.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/IWebServiceType.java
deleted file mode 100644
index b149698..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/IWebServiceType.java
+++ /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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.wizard;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-
-/**
-* This is the interface for objects that represent a kind of
-* Web Service artifact. The primary purpose of a WebServiceType
-* object is to manufacture the wizard pages that support the type.
-*/
-public interface IWebServiceType
-{
-  /**
-  * Returns the id of this Web Service type.
-  * @return id of this Web Service type.
-  */
-  public String getId ();
-  /**
-  * Returns a short, locale specific name of this Web Service type.
-  * @return A short, locale specific name of this Web Service type.
-  */
-  public String getLabel ();
-
-  /**
-  * Returns a locale specific description of this Web Service type's extension metadata.
-  * @return A locale specific description of this Web Service type's extension metadata.
-  */
-  public String[] getExtensionMetadata ();
-  
-  /**
-  * Returns a locale specific description of this Web Service type's resource metadata.
-  * @return A locale specific description of this Web Service type's resource metadata.
-  */
-  public String[] getResourceTypeMetadata ();  
-  
-  /**
-  * Returns true if the plugin.xml contains an attribute of "canFinish" with a value of true.  Otherwise, 
-  * false is returned.  Note: if the "canFinish" attribute is not specified true is returned by default.
-  * @return Returns whether or not the user can finish on the pages before the web service type pages.
-  */
-  public boolean getCanFinish();  
-
-  /**
-   * Returns the configuration element associated with
-   * this runtime.
-   * 
-   * @return org.eclipse.core.runtime.IConfigurationElement
-   */
-  public IConfigurationElement getConfigurationElement();
-
-  public String getObjectSelectionWidget();
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/PrivateUDDIRegistryTypeRegistry.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/PrivateUDDIRegistryTypeRegistry.java
deleted file mode 100644
index e19b750..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/PrivateUDDIRegistryTypeRegistry.java
+++ /dev/null
@@ -1,59 +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.consumption.ui.wizard;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jst.ws.internal.ui.uddi.PrivateUDDIRegistryType;
-
-
-public class PrivateUDDIRegistryTypeRegistry
-{
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-  private static PrivateUDDIRegistryTypeRegistry instance_;
-
-  private PrivateUDDIRegistryTypeRegistry() {
-  }
-
-  /**
-  * Returns a singleton instance of this class.
-  * @return A singleton WebServiceClientTypeRegistry object.
-  */
-  public static PrivateUDDIRegistryTypeRegistry getInstance() {
-    if (instance_ == null) {
-      instance_ = new PrivateUDDIRegistryTypeRegistry();
-    }
-    
-    return instance_;
-  }
-
-  public PrivateUDDIRegistryType getPrivateUDDIRegistryType() {
-    IExtensionRegistry reg = Platform.getExtensionRegistry();
-    IConfigurationElement[] config = reg.getConfigurationElementsFor(
-                                     "org.eclipse.jst.ws.consumption.ui",
-                                     "privateUDDIRegistryType");
-
-    try {
-      Object configElement = ((config.length > 0) ? config[0].createExecutableExtension("class") : null);
-      if(configElement != null && configElement instanceof PrivateUDDIRegistryType) 
-        return (PrivateUDDIRegistryType)configElement; 
-      else
-        return null;
-    }
-    catch (CoreException e) {
-      return null;
-    }
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/PublicUDDIRegistryTypeRegistry.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/PublicUDDIRegistryTypeRegistry.java
deleted file mode 100644
index 4d28732..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/PublicUDDIRegistryTypeRegistry.java
+++ /dev/null
@@ -1,97 +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.consumption.ui.wizard;
-
-import java.util.Vector;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistryType;
-
-
-public class PublicUDDIRegistryTypeRegistry
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2002.";
-
-  private static PublicUDDIRegistryTypeRegistry instance_;
-  private Vector types_;
-  private Vector configElements_;
-
-  private PublicUDDIRegistryTypeRegistry() {
-    types_ = new Vector();
-    configElements_ = new Vector();
-
-    init();
-  }
-
-  /**
-  * Returns a singleton instance of this class.
-  * @return A singleton WebServiceClientTypeRegistry object.
-  */
-  public static PublicUDDIRegistryTypeRegistry getInstance() {
-    if (instance_ == null) {
-      instance_ = new PublicUDDIRegistryTypeRegistry();
-    }
-    
-    return instance_;
-  }
-
-  public void init() {
-    IExtensionRegistry reg = Platform.getExtensionRegistry();
-    IConfigurationElement[] config = reg.getConfigurationElementsFor(
-                                     "org.eclipse.jst.ws.consumption.ui",
-                                     "publicUDDIRegistryType");
-
-    for (int i = 0; i < config.length; i++) {
-      try {
-        Object configElement = config[i].createExecutableExtension("class");
-
-        if( configElement instanceof PublicUDDIRegistryType)  {
-          types_.add(configElement);
-          configElements_.add(config[i]);
-        }
-      }
-      catch (CoreException e) {}
-    }
-  }
-
-  public PublicUDDIRegistryType[] getAllPublicUDDIRegistryTypes() {
-    PublicUDDIRegistryType[] types = new PublicUDDIRegistryType[types_.size()];
-    for (int i = 0; i < types_.size(); i++) {
-      types[i] = (PublicUDDIRegistryType)types_.elementAt(i);
-    }
-    return types;
-  }
-
-  public PublicUDDIRegistryType getPublicUDDIRegistryTypeByID(String id) {
-    for (int i = 0; i < configElements_.size(); i++) {
-      IConfigurationElement c = (IConfigurationElement)configElements_.elementAt(i);
-      if (c.getAttribute("id").equals(id))
-        return (PublicUDDIRegistryType)types_.elementAt(i);
-    }
-    return null;
-  }
-
-  public String getPublicUDDIRegistryTypeIDByName(String name) {
-    for (int i = 0; i < types_.size(); i++) {
-      PublicUDDIRegistryType type = (PublicUDDIRegistryType)types_.elementAt(i);
-      if (type.getName().equals(name))
-        return ((IConfigurationElement)configElements_.elementAt(i)).getAttribute("id");
-    }
-    return null;
-  }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/RuntimeServerSelectionDialog.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/RuntimeServerSelectionDialog.java
deleted file mode 100644
index 50235d2..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/RuntimeServerSelectionDialog.java
+++ /dev/null
@@ -1,877 +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.consumption.ui.wizard;
-
-import java.util.Hashtable;
-import java.util.Vector;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.j2ee.internal.servertarget.IServerTargetConstants;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.jst.ws.internal.wsrt.WebServiceRuntimeExtensionUtils;
-import org.eclipse.jst.ws.internal.wsrt.WebServiceRuntimeInfo;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-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.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.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.swt.widgets.TreeItem;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.help.IWorkbenchHelpSystem;
-import org.eclipse.wst.server.core.IModuleType;
-import org.eclipse.wst.server.core.IRuntimeType;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.IServerType;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.server.ui.ServerUICore;
-
-public class RuntimeServerSelectionDialog extends Dialog implements Listener {
-
-  private Shell thisShell;
-  private Group viewSelectionGroup_;
-  private Text messageBanner_;
-  private Composite primaryGroup_;
-  private Group runtimesGroup_;
-  private Group serversGroup_;
-  private Tree runtimesList_;
-  private Tree serverList_;
-  private Button viewSelectionByRuntimeButton_;
-  private Button viewSelectionByServerButton_;
-  private Button viewSelectionByExploreButton_;
-  private Combo j2eeVersionCombo;
-  /*
-   * CONTEXT_ID PWRS0001 for the selection of runtime, server and project combination
-   */
-  private String INFOPOP_PWRS_DIALOG = WebServiceConsumptionUIPlugin.ID + ".PWRS0001";
-  /* CONTEXT_ID PWRS0002 for the runtime selection on in the dailog */
-  private String INFOPOP_PWRS_LIST_RUNTIMES = WebServiceConsumptionUIPlugin.ID + ".PWRS0002";
-  /* CONTEXT_ID PWRS0003 for the server selection in the dialog */
-  private String INFOPOP_PWRS_LIST_SERVERS = WebServiceConsumptionUIPlugin.ID + ".PWRS0003";
-  /*
-   * CONTEXT_ID PWRS0004 for the EJB Project combo box of the runtime selection dialog
-   */
-  //  private String INFOPOP_PWRS_EJB_PROJECT = WebServiceConsumptionUIPlugin.ID
-  // + ".PWRS0004";
-  /*
-   * CONTEXT_ID PWRS0005 for the runtime view radio button of the runtime selection dialog
-   */
-  private String INFOPOP_PWRS_RADIO_RUNTIME = WebServiceConsumptionUIPlugin.ID + ".PWRS0005";
-  /*
-   * CONTEXT_ID PWRS0006 for the server view radio button of the runtime selection dialog
-   */
-  private String INFOPOP_PWRS_RADIO_SERVER = WebServiceConsumptionUIPlugin.ID + ".PWRS0006";
-  /*
-   * CONTEXT_ID PWRS0007 for the explore view radio button of the runtime selection dialog
-   */
-  private String INFOPOP_PWRS_RADIO_EXPLORE = WebServiceConsumptionUIPlugin.ID + ".PWRS0007";
-  /*
-   * CONTEXT_ID PWRS0008 for the Web Project combo box of the runtime selection dialog
-   */
-  //  private String INFOPOP_PWRS_COMBO_PROJECT =
-  // WebServiceConsumptionUIPlugin.ID + ".PWRS0008";
-  /*
-   * CONTEXT_ID PWRS0009 for the J2EE version combo box of the runtime selection dialog
-   */
-  private String INFOPOP_PWRS_J2EE_VERSION = WebServiceConsumptionUIPlugin.ID + ".PWRS0009";
-
-  // rskreg
-  //private WebServiceServerRuntimeTypeRegistry wssrtRegistry;
-  //private WebServiceClientTypeRegistry wsctRegistry;
-  // rskreg
-  private Hashtable serverLabels_;
-  private Hashtable existingServersTable_;
-  private String defaultServer_;
-  private String defaultRuntime_;
-  private String typeId_;
-  private String clientTypeId_;
-  // rskreg
-  //private IWebServiceRuntime selectedRuntime_;
-  private WebServiceRuntimeInfo selectedRuntime_;
-  // rskreg
-  private IServer selectedServer_;
-  private String selectedServerLabel_;
-  private String selectedServerFactoryID_;
-  private boolean isExistingServer_;
-  private boolean validateOn_ = false;
-  private byte selectionMode_;
-  private final byte MODE_SERVICE = (byte) 0;
-  private final byte MODE_CLIENT = (byte) 1;
-  private final String SERVER_TYPES_ICON = "icons/servers/servers_obj.gif";
-  private final String EXISTING_SERVERS_ICON = "icons/servers/existing_server_obj.gif";
-  private String j2eeVersion;
-  private String serverInstanceID_;
-
-  public RuntimeServerSelectionDialog(Shell shell, byte mode, TypeRuntimeServer ids, String j2eeVersion) {
-    super(shell);
-    selectionMode_ = mode;
-    typeId_ = ids.getTypeId();
-    defaultRuntime_ = ids.getRuntimeId();
-    defaultServer_ = ids.getServerId();
-    serverInstanceID_ = ids.getServerInstanceId();
-    setIsExistingServer(ids.getServerInstanceId() != null);
-    serverLabels_ = new Hashtable();
-    existingServersTable_ = new Hashtable();
-	// rskreg
-    //wsctRegistry = WebServiceClientTypeRegistry.getInstance();
-    //wssrtRegistry = WebServiceServerRuntimeTypeRegistry.getInstance();
-	// rskreg
-    this.j2eeVersion = j2eeVersion;
-  }
-
-  public TypeRuntimeServer getTypeRuntimeServer() {
-    TypeRuntimeServer ids = new TypeRuntimeServer();
-
-    ids.setTypeId(typeId_);
-    if (selectedRuntime_ != null)
-      ids.setRuntimeId(selectedRuntime_.getId());
-    
-    if( selectedServerFactoryID_ == null )
-    {
-      ids.setServerId( defaultServer_ );
-      ids.setServerInstanceId( serverInstanceID_ );
-    }
-    else
-    {
-      ids.setServerId(selectedServerFactoryID_);
-
-      if (isExistingServer_ && selectedServer_ != null) 
-      {
-        ids.setServerInstanceId(selectedServer_.getId());
-      }
-    }
-    
-    return ids;
-  }
-
-  public String getJ2EEVersion() {
-    return j2eeVersion;
-  }
-
-  private boolean getIsExistingServer() {
-    return isExistingServer_;
-  }
-
-  private void setIsExistingServer(boolean isExisting) {
-    isExistingServer_ = isExisting;
-  }
-
-  protected Control createContents(Composite parent) {
-    Composite comp = (Composite) super.createContents(parent);
-    parent.getShell().pack();
-    return comp;
-  }
-
-  protected Control createDialogArea(Composite parent) {
-    validateOn_ = false;
-    thisShell = parent.getShell();
-    if (thisShell == null) {
-      thisShell = createShell();
-    }
-    Composite composite = (Composite) super.createDialogArea(parent);
-    GridLayout gl;
-    GridData gd;
-    // Window title
-    if (selectionMode_ == MODE_SERVICE)
-      thisShell.setText(getMessage("%PAGE_TITLE_WS_RUNTIME_SELECTION"));
-    else
-      thisShell.setText(getMessage("%PAGE_TITLE_WS_CLIENT_RUNTIME_SELECTION"));
-    
-    IWorkbenchHelpSystem helpSystem = PlatformUI.getWorkbench().getHelpSystem();
-    
-    helpSystem.setHelp(thisShell, INFOPOP_PWRS_DIALOG);
-    // Dialog description banner
-    messageBanner_ = new Text(composite, SWT.READ_ONLY | SWT.WRAP);
-    messageBanner_.setText(getMessage("%PAGE_DESC_WS_RUNTIME_SELECTION") + "\n" + "      "); // reserves a second line for message display
-    messageBanner_.setToolTipText(getMessage("%PAGE_DESC_WS_RUNTIME_SELECTION"));
-    gd = new GridData(GridData.FILL_HORIZONTAL);
-    messageBanner_.setLayoutData(gd);
-    //  -----------------------------------------------------------------------//
-    new Label(composite, SWT.HORIZONTAL);
-    //  -----------------------------------------------------------------------//
-    // Selection
-    thisShell.setToolTipText(getMessage("%TOOLTIP_PWRS_PAGE"));
-    viewSelectionGroup_ = new Group(composite, SWT.NONE);
-    gl = new GridLayout();
-    gl.marginHeight = 0;
-    gl.marginWidth = 0;
-    viewSelectionGroup_.setLayout(gl);
-    gd = new GridData(GridData.FILL_HORIZONTAL);
-    viewSelectionGroup_.setLayoutData(gd);
-    if (selectionMode_ == MODE_SERVICE)
-      viewSelectionGroup_.setText(getMessage("%LABEL_SELECTION_VIEW_TITLE"));
-    else
-      viewSelectionGroup_.setText(getMessage("%LABEL_CLIENT_SELECTION_VIEW_TITLE"));
-    viewSelectionByServerButton_ = new Button(viewSelectionGroup_, SWT.RADIO);
-    viewSelectionByServerButton_.setText(getMessage("%LABEL_SELECTION_VIEW_SERVER"));
-    viewSelectionByServerButton_.addListener(SWT.Selection, this);
-    viewSelectionByServerButton_.setToolTipText(getMessage("%TOOLTIP_PWRS_RADIO_SERVER"));
-    viewSelectionByServerButton_.setSelection(true);
-    helpSystem.setHelp(viewSelectionByServerButton_, INFOPOP_PWRS_RADIO_SERVER);
-    viewSelectionByRuntimeButton_ = new Button(viewSelectionGroup_, SWT.RADIO);
-    viewSelectionByRuntimeButton_.setText(getMessage("%LABEL_SELECTION_VIEW_RUNTIME"));
-    viewSelectionByRuntimeButton_.addListener(SWT.Selection, this);
-    viewSelectionByRuntimeButton_.setToolTipText(getMessage("%TOOLTIP_PWRS_RADIO_RUNTIME"));
-    helpSystem.setHelp(viewSelectionByRuntimeButton_, INFOPOP_PWRS_RADIO_RUNTIME);
-    viewSelectionByExploreButton_ = new Button(viewSelectionGroup_, SWT.RADIO);
-    viewSelectionByExploreButton_.setText(getMessage("%LABEL_SELECTION_VIEW_EXPLORE"));
-    viewSelectionByExploreButton_.addListener(SWT.Selection, this);
-    viewSelectionByExploreButton_.setToolTipText(getMessage("%TOOLTIP_PWRS_RADIO_EXPLORE"));
-    helpSystem.setHelp(viewSelectionByExploreButton_, INFOPOP_PWRS_RADIO_EXPLORE);
-    primaryGroup_ = new Composite(composite, SWT.NONE);
-    gl = new GridLayout();
-    gl.numColumns = 1;
-    gl.makeColumnsEqualWidth = true;
-    gd = new GridData(GridData.FILL_BOTH);
-    primaryGroup_.setLayout(gl);
-    primaryGroup_.setLayoutData(gd);
-    runtimesGroup_ = new Group(primaryGroup_, SWT.NONE);
-    gl = new GridLayout();
-    runtimesGroup_.setLayout(gl);
-    gd = new GridData(GridData.FILL_BOTH);
-    runtimesGroup_.setLayoutData(gd);
-    runtimesGroup_.setText(getMessage("%LABEL_RUNTIMES_LIST"));
-    runtimesList_ = new Tree(runtimesGroup_, SWT.SINGLE | SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
-    gd = new GridData(GridData.FILL_BOTH);
-    runtimesList_.setLayoutData(gd);
-    runtimesList_.addListener(SWT.Selection, this);
-    runtimesList_.setToolTipText(getMessage("%TOOLTIP_PWRS_LIST_RUNTIMES"));
-    helpSystem.setHelp(runtimesList_, INFOPOP_PWRS_LIST_RUNTIMES);
-    //  Server labels control
-    serversGroup_ = new Group(primaryGroup_, SWT.NONE);
-    gl = new GridLayout();
-    serversGroup_.setLayout(gl);
-    gd = new GridData(GridData.FILL_BOTH);
-    serversGroup_.setLayoutData(gd);
-    serversGroup_.setText(getMessage("%LABEL_SERVERS_LIST"));
-    serverList_ = new Tree(serversGroup_, SWT.SINGLE | SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
-    serverList_.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.FILL_VERTICAL));
-    serverList_.addListener(SWT.Selection, this);
-    serverList_.setToolTipText(getMessage("%TOOLTIP_PWRS_LIST_SERVERS"));
-    ServersList serverList = new ServersList();
-    serverList.setServerTreeItems(serverList_);
-    helpSystem.setHelp(serverList_, INFOPOP_PWRS_LIST_SERVERS);
-    setRuntimesGroup();
-    // J2EE version
-    Composite j2eeVersionComposite = new Composite(composite, SWT.NONE);
-    gl = new GridLayout();
-    gl.marginHeight = 0;
-    gl.marginWidth = 0;
-    gl.numColumns = 2;
-    gd = new GridData(GridData.FILL_HORIZONTAL);
-    j2eeVersionComposite.setLayout(gl);
-    j2eeVersionComposite.setLayoutData(gd);
-    Label j2eeVersionLabel = new Label(j2eeVersionComposite, SWT.NONE);
-    j2eeVersionLabel.setText(getMessage("%LABEL_J2EE_VERSION"));
-    j2eeVersionCombo = new Combo(j2eeVersionComposite, SWT.DROP_DOWN | SWT.READ_ONLY);
-    gl = new GridLayout();
-    gl.marginHeight = 0;
-    gl.marginWidth = 0;
-    gd = new GridData(GridData.FILL_HORIZONTAL);
-    j2eeVersionCombo.setLayout(gl);
-    j2eeVersionCombo.setLayoutData(gd);
-    j2eeVersionCombo.addListener(SWT.Selection, this);
-    j2eeVersionCombo.setToolTipText(getMessage("%TOOLTIP_PWRS_J2EE_VERSION"));
-    helpSystem.setHelp(j2eeVersionCombo, INFOPOP_PWRS_J2EE_VERSION);
-    //  -----------------------------------------------------------------------//
-    new Label(composite, SWT.HORIZONTAL);
-    validateOn_ = true;
-    org.eclipse.jface.dialogs.Dialog.applyDialogFont(parent);
-    setJ2EEVersions();
-    return composite;
-  }
-
-  private void setJ2EEVersions() {
-    j2eeVersionCombo.setEnabled(true);
-    j2eeVersionCombo.removeAll();
-    String[] versions = null;
-	// rskreg
-    //if (selectedRuntime_ != null)
-      //versions = selectedRuntime_.getJ2EEVersions();
-    if (selectedRuntime_ != null)
-	      versions = selectedRuntime_.getJ2eeLevels();
-	// rskreg	
-    if (versions != null) {
-      //j2eeVersionCombo.setItems(versions);
-      setJ2EEComboItems(versions);
-      j2eeVersionCombo.select(0);
-      if (j2eeVersion != null) {
-        int i = j2eeVersionCombo.indexOf(J2EEUtils.getLabelFromJ2EEVersion(j2eeVersion));
-        if (i > 0)
-          j2eeVersionCombo.select(i);
-      }
-    }
-    else
-      j2eeVersionCombo.setEnabled(false);
-  }
-
-  private void setJ2EEComboItems(String[] versions)
-  {
-    String[] j2eeLabels = new String[versions.length];
-    for (int i = 0; i < versions.length; i++)
-    {
-      String label = J2EEUtils.getLabelFromJ2EEVersion(versions[i]);
-      if (label != null && label.length() >0)
-        j2eeLabels[i] = J2EEUtils.getLabelFromJ2EEVersion(versions[i]);
-      else
-        j2eeLabels[i] = getMessage("%LABEL_NA"); 
-    }
-    j2eeVersionCombo.setItems(j2eeLabels);
-  }
-
-  private void setJ2EEVersionBasedOnServer()
-  {
-    //Get the list of J2EE versions
-    String[] versions = null;
-    if (selectedRuntime_ == null || selectedServerFactoryID_== null)
-      return;
-   
-	// rskreg
-    //versions = selectedRuntime_.getJ2EEVersions();
-	versions = selectedRuntime_.getJ2eeLevels();
-	// rskreg
-    if (versions==null)
-      return;
-    
-    //Pick the first version that the selected server supports
-    for (int i=0; i<versions.length; i++)
-    {
-      if (isServerValid(selectedServerFactoryID_, versions[i]))
-      {
-        //Set the j2ee level to this version
-        String label = J2EEUtils.getLabelFromJ2EEVersion(versions[i]);
-        j2eeVersionCombo.setText(label);
-        setJ2EEVersionFromJ2EEVersionCombo();
-      }
-    }      
-  }
-
-  
-  private boolean isServerValid(String serverFactoryId, String j2eeVersion)
-  {
-    String stJ2EEVersion = ServerUtils.getServerTargetJ2EEVersion(j2eeVersion);
-    if (stJ2EEVersion == null)
-      return false;
-    
-    IServerType serverType = ServerCore.findServerType(serverFactoryId);
-    if (serverType!=null)
-    {
-      IRuntimeType serverRuntime = serverType.getRuntimeType();
-      IModuleType[] mTypes = serverRuntime.getModuleTypes();
-      for (int i=0; i<mTypes.length; i++)      
-      {
-        IModuleType mType = mTypes[i];
-        String type = mType.getId();
-        String moduleVersion = mType.getVersion();
-        if (type.equals(IServerTargetConstants.WEB_TYPE) && moduleVersion.equals(stJ2EEVersion))
-        {
-          //Found a match, return true!
-          return true;
-        }
-      }
-    }
-    //no match found or the server type was null. Return false.
-    return false;
-  }
-  
-  private void validateServerRuntimeSelection() {
-    // Check if the extension exists
-    if (selectionMode_ == MODE_SERVICE) {
-      if (selectedServerFactoryID_!=null && selectedRuntime_!=null) {
-		  // rskreg
-      //WebServiceServerRuntimeType wssrt = wssrtRegistry.getWebServiceServerRuntimeType(selectedServerFactoryID_, selectedRuntime_.getId(), typeId_);
-		  // rskreg
-      // rm WebServiceServerRuntimeType wssrt =
-      // wssrtRegistry.getWebServiceServerRuntimeType(selectedServerFactoryID_,
-      // selectedRuntime_.getId(), wse.getWebServiceType());
-      // rm if (wssrt!=null &&
-      // wssrtRegistry.isServerSupportedForChosenType(wse.getWebServiceType(),selectedServerFactoryID_))
-      // {
-		  
-		  //rskreg
-      boolean wssrtSupported = WebServiceRuntimeExtensionUtils.isServerRuntimeTypeSupported(selectedServerFactoryID_,selectedRuntime_.getId(),typeId_);		  
-      //if (wssrt != null && wssrtRegistry.isServerSupportedForChosenType(typeId_, selectedServerFactoryID_)) {
-        //setOKStatusMessage();
-      //}
-	  
-      if (wssrtSupported && WebServiceRuntimeExtensionUtils.isServerSupportedForChosenType(typeId_, selectedServerFactoryID_)) {
-	        setOKStatusMessage();
-	      }
-	  // rskreg
-      else {
-        setERRORStatusMessage("%MSG_INVALID_SRT_SELECTIONS");
-      }
-      }
-    }
-    else {
-      // rm String clientId =
-      // wsctRegistry.getClientTypeIdByName(clientScenarioId_);
-      String clientId = typeId_;
-      // rm String clientId =
-      // wsctRegistry.getClientTypeIdByName(wse.getProxySelected());
-	  // rskreg
-	  
-      //WebServiceServer wss = wsctRegistry.getWebServiceServerByFactoryId(selectedServerFactoryID_);
-
-      //if (wss == null || selectedRuntime_ == null || !wsctRegistry.webServiceClientRuntimeTypeExists(wss.getId(), selectedRuntime_.getId(), clientId)) {
-        //setERRORStatusMessage("%MSG_INVALID_SRT_SELECTIONS");
-      //}
-      if (selectedServerFactoryID_==null || selectedRuntime_ == null || !WebServiceRuntimeExtensionUtils.webServiceClientRuntimeTypeExists(selectedServerFactoryID_, selectedRuntime_.getId(), clientId)) {
-	        setERRORStatusMessage("%MSG_INVALID_SRT_SELECTIONS");
-	  }	  
-	  // rskreg
-      else {
-        setOKStatusMessage();
-      }
-    }
-    // Disable OK button if the runtime selection is invalid
-    TreeItem[] runtimeSel = runtimesList_.getSelection();
-    if (runtimeSel == null || runtimeSel.length <= 0 || runtimeSel[0].getText().length() == 0) {
-      disableOKButton();
-    }
-    // Disable OK button if server selection is invalid
-    TreeItem[] serverSel = serverList_.getSelection();
-    String currentSelection = (serverSel != null && serverSel.length > 0) ? serverSel[0].getText() : "";
-    if (serverSel == null || currentSelection.length() == 0) {
-      disableOKButton();
-    }
-    if (!serverLabels_.containsKey(currentSelection) || !existingServersTable_.containsKey(currentSelection)) {
-      disableOKButton();
-      setOKStatusMessage();
-    }
-    // Disable OK button if category is selected rather than a server
-    if (serverSel.length > 0 && serverSel[0].getItemCount()!=0) {
-    	disableOKButton();
-    }
-    else {
-    	enableOKButton();
-    }
-    
-  }
-
-  private void setOKStatusMessage() {
-    messageBanner_.setText(getMessage("%PAGE_DESC_WS_RUNTIME_SELECTION"));
-    Color black = new Color(thisShell.getDisplay(), 0x00, 0, 0);
-    messageBanner_.setForeground(black);
-    enableOKButton();
-  }
-
-  private void setERRORStatusMessage(String message) {
-    messageBanner_.setText(getMessage(message));
-    Color red = new Color(thisShell.getDisplay(), 0xFF, 0, 0);
-    messageBanner_.setForeground(red);
-    disableOKButton();
-  }
-
-  private void disableOKButton() {
-    if (getButton(0) != null)
-      getButton(0).setEnabled(false);
-  }
-
-  private void enableOKButton() {
-    if (getButton(0) != null)
-      getButton(0).setEnabled(true);
-  }
-
-  protected void okPressed() {
-    setJ2EEVersionFromJ2EEVersionCombo();
-    //j2eeVersion = (j2eeVersionCombo.getEnabled()) ? j2eeVersionCombo.getText() : null;
-    setReturnCode(OK);
-    close();
-  }
-
-  private void setJ2EEVersionFromJ2EEVersionCombo()
-  {
-    if (j2eeVersionCombo.getEnabled())
-    {
-      String j2eeLabel = j2eeVersionCombo.getText();
-      String j2eeVersionString = J2EEUtils.getJ2EEVersionFromLabel(j2eeLabel);
-      if (j2eeVersionString != null && j2eeVersionString.length() > 0)
-        j2eeVersion = j2eeVersionString;
-      else
-        j2eeVersion = null;
-    }
-    else
-      j2eeVersion = null;    
-  }
-  /**
-   * 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 (!validateOn_)
-      return;
-    enableOKButton();
-    if (viewSelectionByRuntimeButton_ == event.widget) {
-      handleRuntimeViewSelectionEvent();
-      return;
-    }
-    else if (viewSelectionByServerButton_ == event.widget) {
-      handleServerViewSelectionEvent();
-      return;
-    }
-    else if (viewSelectionByExploreButton_ == event.widget) {
-      handleExploreViewSelectionEvent();
-      return;
-    }
-    else if (j2eeVersionCombo == event.widget) {
-      setJ2EEVersionFromJ2EEVersionCombo();
-      //j2eeVersion = (j2eeVersionCombo.getEnabled()) ? j2eeVersionCombo.getText() : null;
-      return;
-    }
-    else if (runtimesList_ == event.widget) {
-      TreeItem[] runtimeSel = runtimesList_.getSelection();
-      processRuntimeListSelection(runtimeSel[0].getText());
-      validateServerRuntimeSelection();
-      setJ2EEVersions();
-      setJ2EEVersionBasedOnServer();
-    }
-    else if (serverList_ == event.widget) {
-      processServerListSelection();
-      validateServerRuntimeSelection();
-      setJ2EEVersionBasedOnServer();
-    }
-  }
-
-  private void handleRuntimeViewSelectionEvent() {
-    GridLayout gl = new GridLayout();
-    gl.numColumns = 1;
-    gl.makeColumnsEqualWidth = true;
-    GridData gd = new GridData(GridData.FILL_BOTH);
-    primaryGroup_.setLayout(gl);
-    primaryGroup_.setLayoutData(gd);
-    primaryGroup_.layout();
-
-    // TODO: Show all runtimes, and only servers supported by current type id
-  }
-
-  // 
-  // Called by handleEvent() when the user selects the layout to view
-  //
-  public void handleServerViewSelectionEvent() {
-    GridLayout gl = new GridLayout();
-    gl.numColumns = 1;
-    gl.makeColumnsEqualWidth = true;
-    GridData gd = new GridData(GridData.FILL_BOTH);
-    primaryGroup_.setLayout(gl);
-    primaryGroup_.setLayoutData(gd);
-    primaryGroup_.layout();
-    serversGroup_.setLocation(5, 5);
-    runtimesGroup_.setLocation(4, 100);
-    serversGroup_.layout();
-    runtimesGroup_.layout();
-
-    // TODO: Show all servers, and only runtimes supported by the current type id
-  }
-
-  // 
-  // Called by handleEvent() when the user selects the layout to view
-  //
-  private void handleExploreViewSelectionEvent() {
-    GridLayout gl;
-    gl = (GridLayout) primaryGroup_.getLayout();
-    gl.numColumns = 2;
-    gl.makeColumnsEqualWidth = true;
-    GridData gd = new GridData(GridData.FILL_BOTH);
-    primaryGroup_.setLayout(gl);
-    primaryGroup_.setLayoutData(gd);
-    primaryGroup_.layout();
-
-    // TODO: Show all servers and runtimes from the type id
-
-  }
-
-  private void processRuntimeListSelection(String runtimeName) {
-	  // rskreg
-    if (selectionMode_ == MODE_SERVICE) {
-      //selectedRuntime_ = wssrtRegistry.getWebServiceRuntimeByLabel(runtimeName);
-		selectedRuntime_ = WebServiceRuntimeExtensionUtils.getWebServiceRuntimeByLabel(runtimeName);
-    }
-    else {
-      //selectedRuntime_ = wsctRegistry.getWebServiceRuntimeByName(runtimeName);
-		selectedRuntime_ = WebServiceRuntimeExtensionUtils.getWebServiceRuntimeByLabel(runtimeName);
-    }
-	 // rskreg
-  }
-
-  private void processServerListSelection() {
-    String currentSelection;
-    TreeItem[] serverSel = serverList_.getSelection();
-    if (serverSel != null && serverSel.length > 0) {
-      currentSelection = serverSel[0].getText();
-      if (serverLabels_.containsKey(currentSelection) || existingServersTable_.containsKey(currentSelection)) {
-        if (existingServersTable_.containsKey(currentSelection)) {
-          selectedServer_ = (IServer) existingServersTable_.get(currentSelection);
-          selectedServerLabel_ = currentSelection;
-          selectedServerFactoryID_ = selectedServer_.getServerType().getId();
-        }
-        else if (serverLabels_.containsKey(currentSelection)) {
-          TreeItem parentItem = serverSel[0].getParentItem();
-          if (parentItem != null && !parentItem.getText().equalsIgnoreCase(getMessage("%LABEL_TREE_EXISTING_SERVERS"))) {
-            selectedServerLabel_ = currentSelection;
-            selectedServer_ = null;
-            selectedServerFactoryID_ = (String) serverLabels_.get(currentSelection);
-          }
-        }
-
-        // check if isExistingServer or new ServerType
-        TreeItem parentItem = serverSel[0].getParentItem();
-        if (parentItem != null && parentItem.getText().equalsIgnoreCase(getMessage("%LABEL_TREE_EXISTING_SERVERS"))) {
-          setIsExistingServer(true);
-        }
-        else {
-          setIsExistingServer(false);
-        }
-      }
-      else {
-        selectedServer_ = null;
-        selectedServerLabel_ = null;
-        selectedServerFactoryID_ = null;
-        setIsExistingServer(false);
-        return;
-      }      
-    }
-  }
-
-  private static String getMessage(String key) {
-    return WebServiceConsumptionUIPlugin.getMessage(key);
-  }
-
-  private static String getMessage(String key, Object[] args) {
-    return WebServiceConsumptionUIPlugin.getMessage(key, args);
-  }
-
-  private void setRuntimesGroup() {
-    runtimesList_.removeAll();
-    String[] runtimes = null;
-
-    if (selectionMode_ == MODE_SERVICE) {
-		// rskreg
-      //runtimes = wssrtRegistry.getRuntimesByType(typeId_);
-		runtimes = WebServiceRuntimeExtensionUtils.getRuntimesByType(typeId_);
-    }
-    else {
-      //runtimes = wsctRegistry.getAllClientRuntimes();
-	  runtimes = WebServiceRuntimeExtensionUtils.getAllClientRuntimes();
-	  // rskreg
-    }
-
-    TreeItem[] runtimeName = new TreeItem[runtimes.length];
-
-    if (runtimes != null) {
-      for (int i = 0; i < runtimes.length; i++) {
-        String runtimeLabel = getRuntimeLabel(runtimes[i]);
-        runtimeName[i] = new TreeItem(runtimesList_, SWT.NONE);
-        runtimeName[i].setText(runtimeLabel);
-
-        if (runtimes[i].equalsIgnoreCase(defaultRuntime_)) {
-          runtimesList_.setSelection(new TreeItem[] { runtimeName[i]});
-          selectedRuntime_ = getRuntime(runtimes[i]);
-        }
-      }
-    }
-  }
-
-  private String getRuntimeLabel(String type) {
-    return getRuntime(type).getLabel();
-  }
-
-  // rskreg
-  private WebServiceRuntimeInfo getRuntime(String type) {
-    if (selectionMode_ == MODE_SERVICE) {
-      //return wssrtRegistry.getRuntimeById(type);
-	  return WebServiceRuntimeExtensionUtils.getWebServiceRuntimeById(type);
-    }
-    else {
-      //return wsctRegistry.getRuntimeById(type);
-	  return WebServiceRuntimeExtensionUtils.getWebServiceRuntimeById(type);
-    }
-  }
-  // rskreg
-
-  // Returns the server Factory Id given a server name
-  private String getServerSelectionFactoryId(String selectedServerName) {
-    if (serverLabels_.containsKey(selectedServerName) && !isExistingServer_)
-      return (String) serverLabels_.get(selectedServerName);
-    else {
-      return ((IServer) existingServersTable_.get(selectedServerName)).getServerType().getId();
-    }
-  }
-
-  /**
-   * 
-   * ServersList class
-   * 
-   * Class which easily creates the Tree structure and entries for existing servers and server types
-   */
-  public class ServersList {
-
-    private TreeItem[] existingServersTree;
-    private TreeItem[] serverTypesTree;
-    boolean existingServer = false;
-
-    public void setServerTreeItems(Tree serversList) {
-      this.setExistingServersTree(serversList);
-      this.setServerTypesTree(serversList);
-    }
-
-    public void setExistingServersTree(Tree serverList) {
-      String[] serverIds = this.getAllExistingServers();
-      existingServersTree = new TreeItem[1];
-      TreeItem[] existingServerItems = new TreeItem[serverIds.length];
-      existingServersTree[0] = new TreeItem(serverList, SWT.NONE);
-      existingServersTree[0].setText(getMessage("%LABEL_TREE_EXISTING_SERVERS"));
-      ImageDescriptor id = WebServiceConsumptionUIPlugin.getImageDescriptor(EXISTING_SERVERS_ICON);
-      if (id != null)
-        existingServersTree[0].setImage(id.createImage());
-      for (int k = 0; k < serverIds.length; k++) {
-        IServerType serverType = ServerCore.findServerType(((IServer) existingServersTable_.get(serverIds[k])).getServerType().getId());
-        if (serverType != null) {
-          existingServerItems[k] = new TreeItem(existingServersTree[0], SWT.NONE);
-          existingServerItems[k].setText(serverIds[k]);
-          if (serverIds[k].equalsIgnoreCase(defaultServer_) && getIsExistingServer()) {
-            existingServersTree[0].setExpanded(true);
-            serverList.setSelection(new TreeItem[] { existingServerItems[k]});
-            existingServer = true;
-            RuntimeServerSelectionDialog.this.setIsExistingServer(true);
-            selectedServer_ = (IServer) existingServersTable_.get(defaultServer_);
-            selectedServerLabel_ = serverIds[k];
-            selectedServerFactoryID_ = selectedServer_.getServerType().getId();
-          }
-          existingServerItems[k].setImage(ServerUICore.getLabelProvider().getImage(serverType));
-        }
-      }
-    }
-
-    public void setServerTypesTree(Tree serverList) {
-
-      TreeItem[] serverTypesTree = new TreeItem[1];
-      serverTypesTree[0] = new TreeItem(serverList, SWT.NONE);
-      serverTypesTree[0].setText(getMessage("%LABEL_TREE_SERVER_TYPES"));
-      ImageDescriptor id = WebServiceConsumptionUIPlugin.getImageDescriptor(SERVER_TYPES_ICON);
-      if (id != null)
-        serverTypesTree[0].setImage(id.createImage());
-      Hashtable categories_ = new Hashtable();
-      Hashtable categoryTreeItem = new Hashtable();
-      String[] serverIds = null;
-      // rm String wst = wse.getWebServiceType();
-      if (selectionMode_ == MODE_SERVICE) {
-		  // rskreg
-        //serverIds = wssrtRegistry.getServerFactoryIdsByType(typeId_);
-		serverIds = WebServiceRuntimeExtensionUtils.getServerFactoryIdsByType(typeId_);
-		  // rskreg
-      }
-      else {
-        //serverIds = wsctRegistry.getServerFactoryIdsByClientType(typeId_);
-		  // rskreg
-        //serverIds = wsctRegistry.getAllClientServerFactoryIds();
-		serverIds = WebServiceRuntimeExtensionUtils.getAllClientServerFactoryIds();
-		// rskreg
-
-      }
-      // rm serverId =
-      // wssrtRegistry.getServerFactoryIdsByType(wse.getWebServiceType());
-      if (serverIds == null) {
-        serverIds = getAllServerTypes();
-      }
-      TreeItem[] parent = new TreeItem[serverIds.length];
-      TreeItem[] item = new TreeItem[serverIds.length];
-      if (serverIds != null) {
-        for (int i = 0; i < serverIds.length; i++) {
-          String server = ServerUtils.getInstance().getServerLabelForId(serverIds[i]);
-          if (server != null) {
-            RuntimeServerSelectionDialog.this.serverLabels_.put(server, serverIds[i]);
-            IServerType serverType = ServerCore.findServerType(serverIds[i]);
-            IRuntimeType runtimeType = serverType.getRuntimeType();
-            if (!categories_.containsKey(serverType) && runtimeType != null) {
-              categories_.put(serverType, runtimeType);
-              if (categoryTreeItem.get(runtimeType) == null) {
-                String categoryText = runtimeType.getName();
-                Image categoryImage = ServerUICore.getLabelProvider().getImage(runtimeType);
-                parent[i] = new TreeItem(serverTypesTree[0], SWT.NONE);
-                parent[i].setText(categoryText);
-                parent[i].setImage(categoryImage);
-                categoryTreeItem.put(runtimeType, parent[i]);
-              }
-              else {
-                parent[i] = (TreeItem) categoryTreeItem.get(runtimeType);
-              }
-              String factoryText = serverType.getName();
-              Image factoryImage = ServerUICore.getLabelProvider().getImage(serverType);
-              item[i] = new TreeItem(parent[i], SWT.NONE);
-              item[i].setText(factoryText);
-              item[i].setImage(factoryImage);
-              item[i].setData(serverType);
-              if (factoryText.equalsIgnoreCase(defaultServer_) && !existingServer) {
-                serverList.setSelection(new TreeItem[] { item[i]});
-                selectedServer_ = null;
-                selectedServerLabel_ = factoryText;
-                selectedServerFactoryID_ = (String) serverLabels_.get(selectedServerLabel_);
-              }
-            }
-          }
-        }
-      }
-
-    }
-
-    /**
-     * Get all servers in the workspace
-     * 
-     * @return String[] of existing server names
-     */
-    private String[] getAllExistingServers() {
-      Vector serverIds = new Vector();
-      {
-        IServer[] servers = ServerCore.getServers();
-        if (servers != null && servers.length!=0) {
-          for (int i = 0; i < servers.length; i++) {
-            IServer server = (IServer) servers[i];
-            serverIds.add(server.getName());
-            existingServersTable_.put(server.getName(), server);
-          }
-        }
-      }
-      return (String[]) serverIds.toArray(new String[serverIds.size()]);
-    }
-
-    /**
-     * Get all server types available for creation
-     * 
-     * @return String[] of server names
-     */
-    private String[] getAllServerTypes() {
-      Vector serverTypes_ = new Vector();
-      IServerType[] defaultServersList = ServerCore.getServerTypes();
-      for (int i = 0; i < defaultServersList.length; i++) {
-        IServerType serverType = (IServerType) defaultServersList[i];
-        serverTypes_.add(serverType.getId());
-      }
-      return (String[]) serverTypes_.toArray(new String[serverTypes_.size()]);
-    }
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/TypeSelectionFilter.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/TypeSelectionFilter.java
deleted file mode 100644
index 2833a42..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/TypeSelectionFilter.java
+++ /dev/null
@@ -1,134 +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.consumption.ui.wizard;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-
-
-public class TypeSelectionFilter
-{
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  private IStructuredSelection initSelection_;
-
-  public String[] getWebServiceTypeByInitialSelection(IStructuredSelection initialSelection, HashMap webServiceTypes)
-  {
-        
-    HashSet supportedTypes = new HashSet();
-    if (initialSelection != null && initialSelection.size() == 1)
-    {
-      
-      // Check for null initial selection
-      Object initialObject = initialSelection.getFirstElement();
-      if (initialObject == null)
-      {
-        return null;
-      }
-      // Match up resource type metadata with initial selection
-      Iterator iter = webServiceTypes.values().iterator();
-      while (iter.hasNext())
-      {
-        IWebServiceType wst = (IWebServiceType)iter.next();
-        String typeId = (String)wst.getId();
-        if (!supportedTypes.contains(typeId))
-        {
-          String[] resourceTypes = wst.getResourceTypeMetadata();
-          for (int i=0; i<resourceTypes.length; i++)
-          {
-            if (resourceTypes[i]!=null)
-            {              
-              if ((initialObject.getClass().getName()).endsWith(resourceTypes[i]))
-              {
-                String name = null;
-                IResource resource = null;
-
-                try
-                {                  
-                  resource = ResourceUtils.getResourceFromSelection(initialObject);
-                }
-                catch( CoreException exc )
-                {
-                  resource = null;
-                }
-
-                if (resource instanceof IContainer)
-                {
-                  name = initialObject.getClass().getName();
-                }
-                else if( resource != null )
-                {
-                  name = resource.getFullPath().toString();
-                }
-                else
-                {
-                  name = initialObject.getClass().getName();
-                }
-                String[] extensions = wst.getExtensionMetadata();
-                if (acceptsName(name, extensions))
-                {
-                  supportedTypes.add(typeId);
-                }
-              }
-              
-            }
-          }
-        }
-      }
-      
-    }    
-  
-    if (supportedTypes.isEmpty())
-      return null;
-    else
-    {
-      return (String[])supportedTypes.toArray(new String[0]);
-    }
-  }
-
-
-  //
-  // Checks if the given name is acceptable based upon its extension
-  //
-  private boolean acceptsName ( String name, String[] extensions)
-  {
-    //Return true if "all" extensions are supported.
-
-    if (extensions[0]!=null)
-    {
-      if (extensions[0].equals("all"))
-      {
-        return true;
-      }
-    }
-
-    for (int i=0; i<extensions.length; i++)
-    {
-      if (extensions[i]!=null)
-      {
-        if (name.endsWith(extensions[i]))
-          return true;
-      }
-    }
-    return false;
-  }
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/TypeSelectionMetadata.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/TypeSelectionMetadata.java
deleted file mode 100644
index 198c12d..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/TypeSelectionMetadata.java
+++ /dev/null
@@ -1,80 +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.consumption.ui.wizard;
-
-import java.util.StringTokenizer;
-
-  //
-  // This class holds the set of distinguishing factors in determining 
-  // the default Web service type.  The default Web Service type will be determined
-  // by pattern matching the initial selection with the supported extension 
-  // and the resource type metadata specified in the manifest file.
-  //
-  public class TypeSelectionMetadata
-  {
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-    public String[] extensionMeta;
-    public String[] resourceTypeMeta;
-
-    public TypeSelectionMetadata(String extensionMD, String resourceTypeMD)
-    {
-      setExtensionMetadata(extensionMD);
-      setResourceTypeMetadata(resourceTypeMD);
-    }
-    
-    public void setExtensionMetadata(String extensionMetadata)
-    {
-      StringTokenizer st = new StringTokenizer(extensionMetadata);
-      extensionMeta = new String[st.countTokens()];
-      int i=0;
-      while (st.hasMoreElements())
-      {
-        String exten = (String)st.nextToken();
-        if (exten!=null)
-        {
-          extensionMeta[i]=exten;
-        }
-        i++;
-      }
-
-    }
-
-    public String[] getExtensionMetadata()
-    {
-      return extensionMeta;
-    }
-    
-    public void setResourceTypeMetadata(String resourceTypeMetadata)
-    {
-      StringTokenizer st = new StringTokenizer(resourceTypeMetadata);
-      resourceTypeMeta = new String[st.countTokens()];
-      int i=0;
-      while (st.hasMoreElements())
-      {
-        String resourceType = (String)st.nextToken();
-        if (resourceType!=null)
-        {
-          resourceTypeMeta[i]=resourceType;
-        }
-        i++;
-      }
-    }
-
-    public String[] getResourceTypeMetadata()
-    {
-      return resourceTypeMeta;
-    }
-
-  }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/WebServiceClientTypeRegistry.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/WebServiceClientTypeRegistry.java
deleted file mode 100644
index 6de4366..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/WebServiceClientTypeRegistry.java
+++ /dev/null
@@ -1,660 +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.consumption.ui.wizard;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Vector;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jst.ws.internal.consumption.fragments.ClientPreAssemblyFragment;
-import org.eclipse.jst.ws.internal.consumption.fragments.ClientPreDeployFragment;
-import org.eclipse.jst.ws.internal.consumption.fragments.ClientPreDevelopFragment;
-import org.eclipse.jst.ws.internal.consumption.fragments.ClientPreInstallFragment;
-import org.eclipse.jst.ws.internal.data.LabelsAndIds;
-import org.eclipse.wst.command.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.env.core.fragment.CommandFragmentFactoryFactory;
-import org.eclipse.wst.command.env.core.registry.CommandRegistry;
-import org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.env.ui.widgets.WidgetRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBindingList;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.IServerType;
-import org.eclipse.wst.server.core.ServerCore;
-
-public class WebServiceClientTypeRegistry implements CommandRegistry
-{
-  private static WebServiceClientTypeRegistry instance_;
-
-  private Vector  configElems_;
-  private HashSet typeNames_;  // no duplicate client type names
-  private HashMap types_;
-  private HashMap clientTypeAndIds_;
-  private HashMap clientIdToLabel_;
-
-  private HashMap webServiceServers;
-  private HashMap webServiceRuntimes;
-  private HashMap webServiceClientTypes;
-  
-  private DataMappingRegistry dataMappingRegistry_;
-  private WidgetRegistry      widgetRegistry_;
-  private CanFinishRegistry   canFinishRegistry_;
-  private HashMap             factoryCache_;
-    
-  private WebServiceClientTypeRegistry()
-  {
-  }
-  
-  //
-  // Loads WebServiceClientType objects into this registry.
-  // This is done by querying the plugin registry for all extensions
-  // hanging on the webServiceClientType extension point. Extensions
-  // must implement the org.eclipse.jst.ws.ui.wizard.WebServiceClientType
-  // interface.
-  //
-  private void loadTypes ()
-  {    
-    IExtensionRegistry reg = Platform.getExtensionRegistry();
-    IConfigurationElement[] config = reg.getConfigurationElementsFor(
-                                     "org.eclipse.jst.ws.consumption.ui",
-                                     "webServiceClientType");
-
-    for(int idx=0; idx<config.length; idx++) 
-    {
-      IConfigurationElement elem = config[idx];
-
-      if (elem.getName().equals("webServiceServer")) { 
-        WebServiceServer wss = new WebServiceServer(elem);
-        webServiceServers.put(elem.getAttribute("id"), wss);
-      }
-      else if (elem.getName().equals("webServiceRuntime")) {
-        WebServiceRuntime rt = new WebServiceRuntime(elem);
-        webServiceRuntimes.put(elem.getAttribute("id"), rt);
-      }
-      else if (elem.getName().equals("webServiceClientType"))
-      {
-
-        String name = elem.getAttribute( "name" );                
-        typeNames_.add( name );  
-        
-        String typeId = elem.getAttribute("clientType");
-        if (typeId==null) {
-          typeId = name;
-        }
-
-        String id = elem.getAttribute("id");       
-        clientTypeAndIds_.put(name, typeId);
-        String serverId = elem.getAttribute("server");
-        String runtimeId = elem.getAttribute("runtime");
-        WebServiceServerRuntimeClientType wst = new WebServiceServerRuntimeClientType(serverId, runtimeId, typeId, name, elem);
-        webServiceClientTypes.put(id, wst);
-        types_.put(id, null );  
-        clientIdToLabel_.put( typeId, name );
-      }
-      configElems_.add( elem );
-      
-    }
-  }
-
- 
-  /**
-  * Loads WebServiceClientType objects into this registry.
-  * See method getInstance().
-  */
-  private void load ()
-  {
-    typeNames_ = new HashSet();
-    configElems_ = new Vector();
-    types_       = new HashMap();
-    clientTypeAndIds_ = new HashMap();
-    webServiceClientTypes = new HashMap();
-    webServiceRuntimes = new HashMap();
-    webServiceServers = new HashMap();
-    clientIdToLabel_  = new HashMap();
-    loadTypes();
-  }
-
-  /**
-  * Returns a singleton instance of this class.
-  * @return A singleton WebServiceClientTypeRegistry object.
-  */
-  public static WebServiceClientTypeRegistry getInstance()
-  {
-    if (instance_ == null)
-    {
-      instance_ = new WebServiceClientTypeRegistry();
-      instance_.load();
-    }
-    return instance_;
-  }
-  
-  public WebServiceRuntime getRuntimeById( String id )
-  {
-    return (WebServiceRuntime)webServiceRuntimes.get( id ); 
-  }
-
-  public String[] getRuntimesByType(String typeId)
-  {
-    IConfigurationElement[] elems = getConfigurationElement(typeId);
-    Vector runtimesVector = new Vector();
-    String[] runtimeIds = new String[elems.length];
-    for (int i=0; i<elems.length; i++)
-    {
-      IConfigurationElement elem = (IConfigurationElement)elems[i];
-      runtimeIds[i] = elem.getAttribute("runtime");
-    }
-    return runtimeIds;    
-  }
-  
-  public boolean doesRuntimeSupportJ2EELevel(String j2eeVersionId, String runtimeId)
-  {
-    IWebServiceRuntime wsr = (IWebServiceRuntime)webServiceRuntimes.get(runtimeId);
-    String[] j2eeVersions = wsr.getJ2EEVersions();
-    if (j2eeVersions==null || j2eeVersions.length==0) 
-      return true;
-    
-    for(int i=0; i<j2eeVersions.length; i++)
-    {
-      if (j2eeVersions[i].equals(j2eeVersionId))
-      {
-      	return true;
-      }
-    }
-    return false;
-  }  
-  
-  public boolean doesRuntimeSupportServerTarget(String serverTargetId, String runtimeId)
-  {
-    //Vector serverFactoryIds = new Vector();
-    Iterator it = webServiceClientTypes.values().iterator();
-    while (it.hasNext()) {
-      WebServiceServerRuntimeClientType wssrt = (WebServiceServerRuntimeClientType)it.next();
-      if (wssrt.runtimeId_!=null) {
-        if ((wssrt.runtimeId_).equalsIgnoreCase(runtimeId)) {
-          WebServiceServer wss = (WebServiceServer)webServiceServers.get(wssrt.serverId_);
-          String thisFactoryId = wss.getFactoryId();
-          IServerType serverType = ServerCore.findServerType(thisFactoryId);
-          if (serverType == null)
-            continue;
-          
-          String thisServerTargetId = serverType.getRuntimeType().getId();          
-          if (thisServerTargetId.equals(serverTargetId))
-            return true;
-        }
-      }
-    }
-    return false;
-  }
-  
-  /**
-  * Returns the names of all registered <code>WebServiceClientType</code>
-  * objects.
-  * @return The names of all registered <code>WebServiceClientType</code>
-  * objects.
-  */
-  public String[] getWebServiceClientTypeNames ()
-  {
-    return (String[])typeNames_.toArray( new String[0] );
-  }
-
-  public LabelsAndIds getClientTypeLabels()
-  {
-    LabelsAndIds labelIds = new LabelsAndIds();
-    Iterator     iterator = clientIdToLabel_.entrySet().iterator();
-    int          size     = clientIdToLabel_.size();
-    String[]     labels   = new String[size];
-    String[]     ids      = new String[size];
-    int          index    = 0;
-    
-    labelIds.setLabels_( labels );
-    labelIds.setIds_( ids );
-    
-    while( iterator.hasNext() ) 
-    {
-      Map.Entry entry = (Map.Entry)iterator.next();
-      
-      ids[index]    = (String)entry.getKey();
-      labels[index] = (String)entry.getValue();
-      index++;
-    }    
-    
-    return labelIds;
-  }
-  
-  /**
-  * Returns the IConfigurationElement given the server, runtime, and type attributes
-  * The benefit of getting the IConfigurationElement is that the corresponding class
-  * file and plugin are not loaded immediately.
-  * @param server label
-  * @param runtime label
-  * @param type label
-  * @return IConfiguration element
-  */
-  public IConfigurationElement getConfigurationElementFor(String serverId, String runtimeId, String typeId)
-  {
-    Iterator iter = webServiceClientTypes.values().iterator();
-    while (iter.hasNext())
-    {
-      WebServiceServerRuntimeClientType wssrt = (WebServiceServerRuntimeClientType)iter.next();
-        if (wssrt.hasConfigurationElementFor(serverId, runtimeId, typeId)) {
-          return wssrt.element_;
-      }
-    }
-    return null;    
-  }
-  
-  public IConfigurationElement getConfigElementFor(String factoryId, String runtimeId, String typeId)
-  {
-    Iterator iter = webServiceClientTypes.values().iterator();
-    while (iter.hasNext())
-    {
-      WebServiceServerRuntimeClientType wssrt = (WebServiceServerRuntimeClientType)iter.next();
-        if (wssrt.hasConfigElementFor(factoryId, runtimeId, typeId)) {
-          return wssrt.element_;
-      }
-    }
-    return null;    
-  }
-
-  public String getClientExtensionIdFor(String serverId, String runtimeId, String typeId) {
-    IConfigurationElement element = getConfigurationElementFor(serverId, runtimeId, typeId);
-    return element.getAttribute("id");
-  }
-
-  public IConfigurationElement getConfigurationElementById(String id) {
-    
-    WebServiceServerRuntimeClientType wsrt = (WebServiceServerRuntimeClientType)webServiceClientTypes.get(id);
-    return (IConfigurationElement)wsrt.element_;    
-
-  }
-  
-  public IConfigurationElement[] getConfigurationElement(String clientTypeId)
-  {
-    Vector v = new Vector();
-    for (Iterator it = configElems_.iterator(); it.hasNext();)
-    {
-      IConfigurationElement element = (IConfigurationElement)it.next();
-      String clientType = element.getAttribute("clientType");
-      if (clientType != null && clientType.equals(clientTypeId))
-        v.add(element);
-    }
-    return (IConfigurationElement[])v.toArray(new IConfigurationElement[0]);
-  }
-
-  public IConfigurationElement[] getConfigurationElement(String clientTypeId, String runtimeId)
-  {
-    Vector v = new Vector();
-    for (Iterator it = configElems_.iterator(); it.hasNext();)
-    {
-      IConfigurationElement element = (IConfigurationElement)it.next();
-      String clientType = element.getAttribute("clientType");
-      String runtime = element.getAttribute("runtime");
-      if (clientType != null && runtime != null && clientType.equals(clientTypeId) && runtime.equals(runtimeId))
-        v.add(element);
-    }
-    return (IConfigurationElement[])v.toArray(new IConfigurationElement[0]);
-  }
-  
-
-
-  public String getServerIdForFactoryId(String factoryId) {
-
-    Iterator iter = webServiceServers.values().iterator();
-    while (iter.hasNext()) {
-      WebServiceServer wss = (WebServiceServer)iter.next();
-      if (wss.getFactoryId().equals(factoryId)) {
-        return wss.getId();
-      }
-    }
-    return null;
-
-  }
-
-  public String getServerFactoryIdByServerLabel(String label) {
-    Iterator iter = webServiceServers.values().iterator();
-    while (iter.hasNext()) {
-      WebServiceServer wss = (WebServiceServer)iter.next();
-      if (wss.getLabel().equals(label)) {
-        return wss.getFactoryId();
-      }
-    }
-    return null;
-  }
-
-  public WebServiceRuntime getWebServiceRuntimeByName(String runtimeName) {
-    Iterator iter = webServiceRuntimes.values().iterator();
-    while (iter.hasNext()) {
-      WebServiceRuntime wsr = (WebServiceRuntime)iter.next();
-      if (wsr.getLabel().equals(runtimeName)) {
-        return wsr;
-      }
-    }
-    return null;
-  }
-
-  public WebServiceServer getWebServiceServerByFactoryId(String factoryId) {
-    Iterator iter = webServiceServers.values().iterator();
-    while (iter.hasNext()) {
-      WebServiceServer wss = (WebServiceServer)iter.next();
-      if (wss.getFactoryId().equals(factoryId)) {
-        return wss;
-      }
-    }
-    return null;
-  }
-  
-  public String getServerInstanceLabelFromInstanceId( String instanceId )
-  {
-    IServer server = ServerCore.findServer( instanceId );
-    
-    return server.getName();
-  }
-  
-  public String[] getAllClientServerFactoryIds() {
-    String[] serverFactoryIds = new String[webServiceServers.size()];
-    int i=0;
-    Iterator iter = webServiceServers.values().iterator();
-    while (iter.hasNext()) {
-      WebServiceServer wss = (WebServiceServer)iter.next();
-      if (wss.getFactoryId()!=null) {
-        serverFactoryIds[i]=wss.getFactoryId();
-        i++;
-      }
-    }
-    return serverFactoryIds;
-  }
-
-  public String[] getAllClientRuntimes() {
-    String[] runtimes = new String[webServiceRuntimes.size()];
-    int i=0;
-    Iterator iter = webServiceRuntimes.values().iterator();
-    while (iter.hasNext()) {
-      WebServiceRuntime wsr = (WebServiceRuntime)iter.next();
-      if (wsr.getId() != null) {
-        runtimes[i]=wsr.getId();
-        i++;
-      }
-    }
-    return runtimes;
-  }
-
-  public String getRuntimeLabelById(String runtimeId) {
-    WebServiceRuntime wsRuntime = (WebServiceRuntime)webServiceRuntimes.get(runtimeId);
-    if (wsRuntime!=null) {
-      return wsRuntime.getLabel();
-    }
-    return null;
-  }
-
-  public String getClientTypeIdByName(String name) {
-    return (String)clientTypeAndIds_.get(name);
-  }
-  
-  public IWebServiceRuntime getWebServiceRuntimeById(String runtimeId)
-  {
-    return (IWebServiceRuntime)webServiceRuntimes.get(runtimeId); 
-  }
-
-
-  /**
-  * Gets the runtime IDs of all web service server runtime type
-  * with an server factory ID equals to the input
-  * @param server factory ID
-  * @return array of runtime IDs
-  */
-  public String[] getRuntimeIdsByServerFactoryId(String serverFactoryID) {
-    Vector runtimeIds = new Vector();
-    Iterator it = webServiceClientTypes.values().iterator();
-    while (it.hasNext()) {
-      WebServiceServerRuntimeClientType wssrt = (WebServiceServerRuntimeClientType)it.next();
-      if (wssrt.serverId_!=null) {
-      	String serverId = wssrt.serverId_;
-      	WebServiceServer wss = (WebServiceServer)webServiceServers.get(serverId);
-      	String wssfId = wss.getFactoryId();
-      	if (wssfId.equals(serverFactoryID))
-      		runtimeIds.add(wssrt.runtimeId_);
-      	/*
-        String wssFactoryId = ((WebServiceServer)webServiceServers.get(wssrt.serverId_)).getFactoryId();
-        if (wssFactoryId.equalsIgnoreCase(serverFactoryID)) {
-          runtimeIds.add(wssrt.runtimeId_);
-        }
-        */
-      }
-    }
-    return (String[])runtimeIds.toArray(new String[0]);
-  }
-
-  public String[] getServerFactoryIdsByClientType(String clientTypeName) {
-    
-    Vector factoryIds = new Vector();
-    String clientTypeId = getClientTypeIdByName(clientTypeName);
-    Iterator iter = webServiceClientTypes.values().iterator();
-    while (iter.hasNext())
-    {
-      WebServiceServerRuntimeClientType wssrt = (WebServiceServerRuntimeClientType)iter.next();
-      if ((wssrt.typeId_).equalsIgnoreCase(clientTypeId)) {
-        WebServiceServer wss = (WebServiceServer)webServiceServers.get(wssrt.serverId_);
-        factoryIds.add(wss.getFactoryId());
-      }
-  
-    }
-    return (String[])factoryIds.toArray(new String[0]);   
-
-  }
-
-  /**
-  * Gets the server factoryIds of all web service server runtime type
-  * with an runtime Id equals to the input
-  * @param runtime Id
-  * @return array of factory Ids
-  */
-  public String[] getServerFactoryIdsByRuntimeId(String runtimeID) {
-    Vector serverFactoryIds = new Vector();
-    Iterator it = webServiceClientTypes.values().iterator();
-    while (it.hasNext()) {
-      WebServiceServerRuntimeClientType wssrt = (WebServiceServerRuntimeClientType)it.next();
-      if (wssrt.runtimeId_!=null) {
-        if ((wssrt.runtimeId_).equalsIgnoreCase(runtimeID)) {
-          WebServiceServer wss = (WebServiceServer)webServiceServers.get(wssrt.serverId_);
-          serverFactoryIds.add(wss.getFactoryId());
-        }
-      }
-    }
-    return (String[])serverFactoryIds.toArray(new String[0]);
-  }
-
-  public boolean webServiceClientRuntimeTypeExists(String serverId, String runtimeId, String typeId) {
-    if (getConfigurationElementFor(serverId, runtimeId, typeId)==null)
-      return false;
-    return true;
-
-  }
-
-  public String[] getServerFactoryIdsByType(String clientTypeId)
-  {
-    String clientTypeName = (String)clientIdToLabel_.get(clientTypeId);
-    return getServerFactoryIdsByClientType(clientTypeName);
-  }
-  
-  public boolean isServerSupportedForChosenType(String clientTypeId, String serverFactoryID)
-  {
-    String[] supportedServerFactoryIds = getServerFactoryIdsByType(clientTypeId);
-    if (supportedServerFactoryIds!=null && supportedServerFactoryIds.length>0)
-    {
-	    for (int i=0; i<supportedServerFactoryIds.length; i++)
-	    {
-	      if (supportedServerFactoryIds[i].equals(serverFactoryID))
-	        return true;
-	    }
-    }
-    return false;
-  }  
-
-  /**
-  *  WebServiceServerRuntimeClientType is the cached metadata including the IConfiguration
-  */
-  public final class WebServiceServerRuntimeClientType
-  {
-    
-   private String typeId_ = null;
-   private String serverId_ = null;
-   private String runtimeId_ = null;
-   private IConfigurationElement element_;
-   private boolean requiresServerRuntime_ = false;
-   private String label_;
-   
-   protected WebServiceServerRuntimeClientType(String serverId, String runtimeId,String typeId, String label, IConfigurationElement elem)
-   {
-    typeId_ = new String(typeId.trim());
-    if (serverId!=null)
-      serverId_ = new String(serverId.trim());
-    if (runtimeId!=null)
-      runtimeId_ = new String(runtimeId.trim());
-    element_ = elem;
-    if (serverId_!=null && runtimeId_!=null) {
-      requiresServerRuntime_ = true;
-    }
-
-    label_ = label;
-   }
-
-   public boolean hasConfigurationElementFor(String serverID, String runtimeID, String typeID) {
-    if (typeId_.equalsIgnoreCase(typeID) && !requiresServerRuntime_)
-      return true;
-
-    if (requiresServerRuntime_) {
-      if (typeId_.equalsIgnoreCase(typeID) &&
-         serverId_.equalsIgnoreCase(serverID) &&
-         runtimeId_.equalsIgnoreCase(runtimeID))
-        return true;
-    }
-    return false;
-   }
-   
-   public boolean hasConfigElementFor(String factoryID, String runtimeID, String typeID) {
-     if (typeId_.equalsIgnoreCase(typeID) && !requiresServerRuntime_)
-       return true;
-
-     if (requiresServerRuntime_) 
-     {
-       String serverID = getServerIdForFactoryId( factoryID ); 
-       
-       if (typeId_.equalsIgnoreCase(typeID) &&
-          serverId_.equalsIgnoreCase(serverID) &&
-          runtimeId_.equalsIgnoreCase(runtimeID))
-         return true;
-     }
-     return false;
-    }
-   
-   public IConfigurationElement getClientTypeConfigurationElementFor(String serverID, String runtimeID, String typeID)
-   {
-    if (this.typeId_.equalsIgnoreCase(typeID) && serverID==null && runtimeID==null)
-      return this.element_;
-    
-    if (this.typeId_.equalsIgnoreCase(typeID) && 
-       this.serverId_.equalsIgnoreCase(serverID) && 
-       this.runtimeId_.equalsIgnoreCase(runtimeID))
-      return this.element_;
-    return null;
-   } 
-  }
-  
-  public CommandFragmentFactoryFactory getFactoryFactory( String[] ids )
-  {
-    String                hashKey = ids[2] + "#" + ids[1] + "#" + ids[0];
-    CommandWidgetBinding  binding = (CommandWidgetBinding)factoryCache_.get( hashKey );
-    
-    if( binding == null )
-    {
-      IConfigurationElement element = getConfigElementFor( ids[2], ids[1], ids[0] ); 
-    
-      if( element == null ) return null;
-    
-      binding = createBinding( element );
-      
-      factoryCache_.put( hashKey, binding );
-      
-      binding.registerDataMappings( dataMappingRegistry_ );
-      
-      if( widgetRegistry_ != null )
-      {
-        binding.registerWidgetMappings( widgetRegistry_ );
-        binding.registerCanFinish( canFinishRegistry_ );
-      }
-    }  
-      
-    return binding;    
-  }
-  
-  private CommandWidgetBinding createBinding(IConfigurationElement element ) 
-  {
-    Vector bindings = new Vector(4);
-    Vector fragments = new Vector(4);
-    
-    addBinding( element, "developBinding", bindings );
-    addBinding( element, "assemblyBinding", bindings );
-    addBinding( element, "deployBinding", bindings );
-    addBinding( element, "installBinding", bindings );
-    
-    fragments.add( new ClientPreDevelopFragment() );
-    fragments.add( new ClientPreAssemblyFragment() );
-    fragments.add( new ClientPreDeployFragment() );
-    fragments.add( new ClientPreInstallFragment() );
-     
-    return new CommandWidgetBindingList( bindings, fragments );
-  }
-  
-  private void addBinding( IConfigurationElement element, String bindingName, Vector list )
-  {
-    Object binding = null;
-    
-    if( element.getAttribute( bindingName ) != null )
-    {
-      try
-      {
-        binding = element.createExecutableExtension( bindingName ); 
-      }
-      catch( CoreException exc )
-      {
-      }
-    }
-    
-    list.add( binding );
-  }
-  
-  public void setDataMappingRegistry( DataMappingRegistry registry )
-  {
-    dataMappingRegistry_ = registry;
-    
-    // We need to rebuild the factory cache each time we start the client
-    // wizard.
-    factoryCache_        = new HashMap();
-  }
-  
-  public void setWidgetRegistry( WidgetRegistry registry )
-  {
-    widgetRegistry_ = registry;;  
-  }
-  
-  public void setCanFinishRegistry( CanFinishRegistry registry )
-  {
-    canFinishRegistry_ = registry;
-  }
-  
-  
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/WebServiceInfo.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/WebServiceInfo.java
deleted file mode 100644
index 64bc552..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/WebServiceInfo.java
+++ /dev/null
@@ -1,26 +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.consumption.ui.wizard;
-
-
-/**
-* This type is used to hold user or calculated 
-* data to be use by finsih tasks
-*/
-public interface WebServiceInfo
-{
-
-}
-
-
-
-
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/WebServiceRuntime.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/WebServiceRuntime.java
deleted file mode 100644
index 3b9eef6..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/WebServiceRuntime.java
+++ /dev/null
@@ -1,119 +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.consumption.ui.wizard;
-
-import java.util.StringTokenizer;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-
-
-/**
-* This is the interface for objects that represent a kind of
-* Web Service artifact. 
-*/
-public class WebServiceRuntime implements IWebServiceRuntime
-{
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  private IConfigurationElement element_;
-  public String runtimeId_;
-  public String runtimeLabel_;
-  public String runtimeDescription_;
-  public String[] j2eeVersions;
-  
-  
-  public WebServiceRuntime(IConfigurationElement elem)
-  {
-    super();
-    this.element_ = elem; 
-  }
-  
-  /**
-  * Returns the id of this Web Service runtime.
-  * @return id of this Web Service runtime.
-  */
-  public String getId ()
-  {
-    if (runtimeId_ == null)
-      runtimeId_ = element_.getAttribute("id");
-    return runtimeId_;
-  }
-  
-  
-  /**
-  * Returns a locale specific description of this Web Service runtime.
-  * @return A locale specific description of this Web Service runtime.
-  */
-  public String getDescription ()
-  {
-    if (runtimeDescription_ == null)
-      runtimeDescription_ = element_.getAttribute("description");
-    return runtimeDescription_;
-  }
-
-  /**
-  * Returns a short, locale specific Label of this Web Service runtime.
-  * @return A short, locale specific Label of this Web Service runtime.
-  */
-  public String getLabel ()
-  {
-    if (runtimeLabel_==null)
-      runtimeLabel_ = WebServiceConsumptionUIPlugin.getMessage((String)element_.getAttribute("label"));    
-    return runtimeLabel_;
-  }
-
-  /**
-   *  Returns a True if this runtime has been set as default
-   *  @return a boolean
-   */
-  public boolean getIsDefault()
-  {
-    return Boolean.valueOf(element_.getAttribute("isDefault")).booleanValue();
-  }
-
-  /**
-   * Returns a String, J2EE version
-   * @return
-   */
-  public String[] getJ2EEVersions()
-  {
-    if (j2eeVersions == null)
-    {
-      String attr = element_.getAttribute("j2eeversion");
-      if (attr != null)
-      {
-        StringTokenizer st = new StringTokenizer(attr, " ");
-        int size = st.countTokens();
-        j2eeVersions = new String[size];
-        for (int i = 0; i < j2eeVersions.length; i++)
-          j2eeVersions[i] = st.nextToken();
-      }
-    }
-    return j2eeVersions;
-  }
-
-  /**
-   * Returns the configuration element associated with
-   * this runtime.
-   * 
-   * @return org.eclipse.core.runtime.IConfigurationElement
-   */
-  public IConfigurationElement getConfigurationElement()
-  {
-    return element_;
-  }
-
-}
-
-
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/WebServiceServer.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/WebServiceServer.java
deleted file mode 100644
index b42e47a..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/WebServiceServer.java
+++ /dev/null
@@ -1,105 +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.consumption.ui.wizard;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.wst.server.core.IServerType;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.server.ui.ServerUICore;
-
-/**
-* This is the interface for objects that represent a kind of
-* Web Service artifact. The primary purpose of a WebServiceType
-* object is to manufacture the wizard pages that support the type.
-*/
-public class WebServiceServer implements IWebServiceServer
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  public IConfigurationElement element_;
-  public String serverId_;
-  public String factoryId_;
-  public String serverLabel_;
-
-  public WebServiceServer(IConfigurationElement elem)
-  {
-    super();
-    this.element_ = elem; 
-  }
-  /**
-  * Returns the id of this Web Service type.
-  * @return id of this Web Service type.
-  */
-  public String getId ()
-  {
-    if (serverId_==null)
-      serverId_ = element_.getAttribute("id");
-    return serverId_;
-  }
-  /**
-  * Returns a short, locale specific name of this Web Service type.
-  * @return A short, locale specific name of this Web Service type.
-  */
-  public String getFactoryId ()
-  {
-    if (factoryId_==null)
-      factoryId_ = element_.getAttribute("factoryId");
-    return factoryId_;
-  }
-
-  /**
-  * Returns a short, locale specific name of this Web Service type.
-  * @return A short, locale specific name of this Web Service type.
-  */
-  public String getLabel ()
-  {
-    if (serverLabel_ == null)
-    {
-      IServerType serverType = ServerCore.findServerType(getFactoryId());    
-      serverLabel_ = ServerUICore.getLabelProvider().getText(serverType);
-    }
-    return serverLabel_;    
-  }  
-
-  /**
-   *  Returns a True if this server has been set as default
-   *  @return a boolean
-   */
-  public boolean getIsDefault()
-  {
-
-    return Boolean.valueOf(element_.getAttribute("isDefault")).booleanValue();
-  }
-  
-  /**
-   * Returns runtime target Id
-   * @return String
-   */
-  public String getRuntimeTypeId()
-  {
-    return element_.getAttribute("runtimeTypeIds");
-  }
-  
-  /**
-   * Returns the configuration element associated with
-   * this type.
-   * 
-   * @return org.eclipse.core.runtime.IConfigurationElement
-   */
-  public IConfigurationElement getConfigurationElement()
-  {
-    return this.element_; 
-  } 
-
-  }
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/WebServiceServerRuntimeType.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/WebServiceServerRuntimeType.java
deleted file mode 100644
index df6e1d7..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/WebServiceServerRuntimeType.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.consumption.ui.wizard;
-
-
-/**
-* This is the interface for objects that represent a kind of
-* Web Service-Server-Runtime artifact. The primary purpose of a WebServiceServerRuntimeType
-* object is to manufacture the wizard pages that support the type, server, and runtime configuration.
-*/
-public interface WebServiceServerRuntimeType
-{
-  /**
-  * Returns a short, locale specific name of this Web Service Server-Runtime type.
-  * @return A short, locale specific name of this Web Service Server-Runtime type.
-  */
-  public String getName ();
-
-  /**
-  * Returns a locale specific description of this Web Service Server-Runtime type.
-  * @return A locale specific description of this Web Service Server-Runtime type.
-  */
-  public String getDescription ();
-
-  /**
-  * Returns a label for the Server supported by this Web Service Server-Runtime type
-  * @return A server label from server plugins
-  */
-  public String getServerLabel();
-
-  /**
-  * Sets a label for the Server supported by this Web Service Server-Runtime type
-  * @param A server label from server plugins
-  */
-  public void setServerLabel(String serverLabel);
-
-  /**
-  * Returns a label for the deployment runtime of this Web Service Server-Runtime type
-  * @return A label for the deployment runtime
-  */
-  public String getRuntimeLabel();
-
-  /**
-  * Sets a label for the deployment runtime of this Web Service Server-Runtime type
-  * @param A label for the deployment runtime
-  */
-  public void setRuntimeLabel(String runtimeLabel);
-
-  /**
-  * Returns a label for the Web Service type associated with this WebServiceServerRuntimeType
-  * @return A label for the Web Service type
-  */
-  public String getWebServiceTypeLabel();
-
-  /**
-  * Returns whether or not a Web Module is required for this WebServiceServerRuntimeType
-  * @return true if requireWebModule
-  */
-  public boolean isWebModuleRequired();
-
-  /**
-  * Sets the boolean value at runtime according to requireWebModule attribute from the manifest file
-  * @param requireWebModule 
-  */
-  public void setWebModuleRequired(boolean requireWebModule);
-
-  /**
-  * Returns whether or not an EJB Module is required for this WebServiceServerRuntimeType
-  * @return true is requireEJBModule is true
-  */
-  public boolean isEJBModuleRequired();
-
-  /**
-  * Sets the boolean value at runtime according to requireEJBModule attribute from the manifest file
-  * @param requireEJBModule 
-  */
-  public void setEJBModuleRequired(boolean requireEJBModule); 
-}
-
-
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/WebServiceServerRuntimeTypeRegistry.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/WebServiceServerRuntimeTypeRegistry.java
deleted file mode 100644
index 85f62fb..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/WebServiceServerRuntimeTypeRegistry.java
+++ /dev/null
@@ -1,1200 +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.consumption.ui.wizard;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.StringTokenizer;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.internal.project.IEJBNatureConstants;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.fragments.ServicePreAssemblyFragment;
-import org.eclipse.jst.ws.internal.consumption.fragments.ServicePreDeployFragment;
-import org.eclipse.jst.ws.internal.consumption.fragments.ServicePreDevelopFragment;
-import org.eclipse.jst.ws.internal.consumption.fragments.ServicePreInstallFragment;
-import org.eclipse.jst.ws.internal.data.LabelsAndIds;
-import org.eclipse.wst.command.env.core.common.Log;
-import org.eclipse.wst.command.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.env.core.fragment.CommandFragmentFactoryFactory;
-import org.eclipse.wst.command.env.core.registry.CommandRegistry;
-import org.eclipse.wst.command.env.core.selection.SelectionList;
-import org.eclipse.wst.command.env.core.selection.SelectionListChoices;
-import org.eclipse.wst.command.env.eclipse.EclipseLog;
-import org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.env.ui.widgets.WidgetRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBindingList;
-import org.eclipse.wst.server.core.IServerType;
-import org.eclipse.wst.server.core.ServerCore;
-
-public class WebServiceServerRuntimeTypeRegistry implements CommandRegistry
-{
-
-  private static WebServiceServerRuntimeTypeRegistry instance_;
-
-  private IConfigurationElement[] indexedConfigElems_;
-
-  private HashMap webServiceServers;
-  private HashMap webServiceRuntimes;
-  private HashMap webServiceTypes;
-  private HashMap webServiceServerRuntimeTypes;
- 
-  private Hashtable runtimesByType_;
-  private Hashtable runtimeLabelById_;
-  private Hashtable runtimeIdByLabel_;
-  private Hashtable serversByType_;
-  private Hashtable serverLabelByFactoryId_;
-  private Hashtable serverFactoryIdByLabel_;
-
-  private Hashtable configElemsById_;
-  
-  private DataMappingRegistry dataMappingRegistry_;
-  private WidgetRegistry      widgetRegistry_;
-  private CanFinishRegistry   canFinishRegistry_;
-  private HashMap             factoryCache_;
-  
-  private SelectionListChoices serverToRuntimeToJ2EE_;
-  private Log					log_;
-  
-  public WebServiceServerRuntimeTypeRegistry() {
-    log_ = new EclipseLog();
-  }
-  //
-  // Loads WebServiceServerRuntimeType objects into this registry.
-  // This is done by querying the plugin registry for all extensions
-  // hanging on the WebServiceServerRuntimeType extension point. Extensions
-  // must implement the org.eclipse.jst.ws.ui.wizard.WebServiceServerRuntimeType
-  // interface.
-  //
-  private void loadTypes ()
-  {
-    IExtensionRegistry reg = Platform.getExtensionRegistry();
-    IConfigurationElement[] config = reg.getConfigurationElementsFor(
-                                     "org.eclipse.jst.ws.consumption.ui",
-                                     "webServiceServerRuntimeType");
-
-    for(int idx=0; idx<config.length; idx++) 
-    {
-      IConfigurationElement elem = config[idx];
-      try 
-      {
-        if (elem.getName().equals("webServiceServer"))
-        { 
-          WebServiceServer wss = new WebServiceServer(elem);
-          webServiceServers.put(elem.getAttribute("id"), wss);
-          String serverLabel = wss.getLabel();
-          if (serverLabel != null && serverLabel.length()>0)
-          {
-            if (!serverLabelByFactoryId_.containsKey(wss.getFactoryId()));
-              serverLabelByFactoryId_.put(wss.getFactoryId(), serverLabel);
-            if (!serverFactoryIdByLabel_.containsKey(serverLabel));
-              serverFactoryIdByLabel_.put(serverLabel, wss.getFactoryId());
-          }
-          
-        }
-        else if (elem.getName().equals("webServiceRuntime"))
-        {
-          WebServiceRuntime rt = new WebServiceRuntime(elem);
-          webServiceRuntimes.put(elem.getAttribute("id"), rt);
-          if(!runtimeLabelById_.containsKey(rt.getId()))
-          	runtimeLabelById_.put(rt.getId(), rt.getLabel());
-          if(!runtimeIdByLabel_.containsKey(rt.getLabel()))
-          	runtimeIdByLabel_.put(rt.getLabel(), rt.getId());
-          
-        }
-        else if (elem.getName().equals("webServiceType"))
-        {
-          WebServiceTypeImpl wst = new WebServiceTypeImpl(elem);
-          webServiceTypes.put(elem.getAttribute("id"), wst);
-        }
-        else if (elem.getName().equals("webServiceServerRuntimeType"))
-        {
-          configElemsById_.put(elem.getAttribute("id"), elem);
-
-          String typeId = elem.getAttribute("type");
-          String serverId = elem.getAttribute("server");
-          String runtimeId = elem.getAttribute("runtime");
-          WebServiceServerRuntimeType_ wssrt = new WebServiceServerRuntimeType_(serverId, runtimeId, typeId, elem);
-          webServiceServerRuntimeTypes.put(elem.getAttribute("id"), wssrt);
-
-          setRuntimesByType(typeId,runtimeId);
-          setServersByType(typeId, serverId);
-        
-        }
-
-      } 
-      catch (Exception e)
-      {
-        log_.log(Log.ERROR, 5058, this, "loadTypes", e);
-      }
-      
-    }
-  }
-
-
-  /**
-  * Sets the Web service runtimes and type from each extension 
-  * in a Hashtable.  The type is the key, and value is a Vector containing 
-  * each runtime supported in that Web service type.
-  * @param runtime name
-  * @param type name
-  */
-  private void setRuntimesByType(String typeId, String runtime)
-  {
-    if(runtimesByType_.get(typeId)!=null)
-    {
-      Vector v = (Vector)runtimesByType_.get(typeId);
-      if (!v.contains(runtime.trim())) {
-        v.add(runtime.trim());
-      }
-    }
-    else
-    {
-      Vector vect = new Vector();
-      vect.add(runtime.trim());
-      runtimesByType_.put(typeId,vect);
-    }
-  }
-
-  public WebServiceRuntime getRuntimeById( String id )
-  {
-    return (WebServiceRuntime)webServiceRuntimes.get( id ); 
-  }
-  
-  /**
-  * Gets the Web sevice runtimes vector given a type
-  * @param Web service type
-  * @return array of runtime labels
-  */
-  public String[] getRuntimesByType(String webServiceType) 
-  {
-    String[] runtimes;
-    if (runtimesByType_.containsKey(webServiceType))
-    {
-      Vector vect =(Vector)runtimesByType_.get(webServiceType);
-      runtimes = new String[vect.size()];
-      for (int i=0; i<vect.size(); i++)
-      {
-        String runtimeId = (String)vect.elementAt(i);
-        WebServiceRuntime wsr = (WebServiceRuntime)webServiceRuntimes.get(runtimeId);
-        if (wsr!=null) {
-          runtimes[i] = (String)wsr.getId();
-        }
-      }
-      return runtimes;
-
-    }
-    else
-    {
-      log_.log(Log.ERROR, 5059, this, "getRuntimesByType", "runtimes not found for Web service type "+webServiceType);
-      return null;
-    }
-
-  }
-  
-  public boolean isRuntimeSupportedForType(String webServiceTypeId, String runtimeId)
-  {
-  	String[] runtimes = getRuntimesByType(webServiceTypeId);
-	for(int i=0;i<runtimes.length;i++)
-	{
-  		if (runtimes[i].equals(runtimeId))
-  		  return true;
-	}
-  	return false;
-  }
-
-  public boolean doesRuntimeSupportJ2EELevel(String j2eeVersionId, String runtimeId)
-  {
-    IWebServiceRuntime wsr = (IWebServiceRuntime)webServiceRuntimes.get(runtimeId);
-    String[] j2eeVersions = wsr.getJ2EEVersions();
-    if (j2eeVersions==null || j2eeVersions.length==0) 
-      return true;
-    
-    for(int i=0; i<j2eeVersions.length; i++)
-    {
-      if (j2eeVersions[i].equals(j2eeVersionId))
-      {
-      	return true;
-      }
-    }
-    return false;
-  }
-  
-  public boolean doesRuntimeSupportServerTarget(String serverTargetId, String runtimeId)
-  {
-    Iterator it = webServiceServerRuntimeTypes.values().iterator();
-    while (it.hasNext()) 
-    {
-      WebServiceServerRuntimeType_ wssrt = (WebServiceServerRuntimeType_)it.next();
-      if (wssrt!=null) {
-        if (wssrt.runtimeId_.equals(runtimeId))
-        {
-          IWebServiceServer wsserver = getWebServiceServerById(wssrt.serverId_);
-          String thisFactoryId = wsserver.getFactoryId();
-          IServerType serverType = ServerCore.findServerType(thisFactoryId);
-          if (serverType == null)
-            continue;
-          
-          String thisServerTargetId = serverType.getRuntimeType().getId(); 
-          if (thisServerTargetId.equals(serverTargetId))
-            return true;
-        }
-      }
-    } 
-    return false;  
-  }
-  
-  /**
-  * Gets the server factoryIDs of all web service server runtime type
-  * with an runtime ID equals to the input
-  * @param runtime ID
-  * @return array of factory IDs
-  */
-  public String[] getServerFactoryIDByRuntimeID(String runtimeID) {
-    Vector v = new Vector();
-    Iterator it = webServiceServerRuntimeTypes.values().iterator();
-    while (it.hasNext()) {
-      WebServiceServerRuntimeType_ wssrt = (WebServiceServerRuntimeType_)it.next();
-      if (wssrt!=null) {
-        if (wssrt.runtimeId_.equals(runtimeID))
-          v.add(getWebServiceServerById(wssrt.serverId_).getFactoryId());
-
-      }
-    }
-    String[] serverFactoryIDs = new String[v.size()];
-    for (int i = 0; i < v.size(); i++) {
-      serverFactoryIDs[i] = (String)v.get(i);
-    }
-    return serverFactoryIDs;
-  }
-
-  /**
-  * Gets the runtime IDs of all web service server runtime type
-  * with an server factory ID equals to the input
-  * @param server factory ID
-  * @return array of runtime IDs
-  */
-  public String[] getRuntimeIDsByServerFactoryID(String serverFactoryID) {
-    Vector v = new Vector();
-    Iterator it = webServiceServerRuntimeTypes.values().iterator();
-    while (it.hasNext()) {
-      WebServiceServerRuntimeType_ wssrt = (WebServiceServerRuntimeType_)it.next();
-      if (wssrt!=null) {
-      	IWebServiceServer wss = getWebServiceServerById(wssrt.serverId_);
-      	String wssfId = wss.getFactoryId();
-      	if (wssfId.equals(serverFactoryID))
-      	{
-      		if (!v.contains(wssrt.runtimeId_))
-      		{
-      			v.add(wssrt.runtimeId_);	
-      		}      		
-      	}
-        /*if (getWebServiceServerById(wssrt.serverId_).getFactoryId().equals(serverFactoryID))
-          v.add(getWebServiceRuntimeById(wssrt.runtimeId_).getId());*/
-      }
-    }
-    String[] runtimeIDs = new String[v.size()];
-    for (int i = 0; i < v.size(); i++) {
-      runtimeIDs[i] = (String)v.get(i);
-    }
-    return runtimeIDs;
-  }
-  
-  /**
-  * Sets the Web service servers and type from each extension 
-  * in a Hashtable.  The type is the key, and value is a Vector containing 
-  * each runtime supported in that Web service type.
-  * @param server name
-  * @param type name
-  */
-  private void setServersByType(String typeId, String server)
-  {
-    if(serversByType_.get(typeId)!=null)
-    {
-      Vector v = (Vector)serversByType_.get(typeId);
-      if (!v.contains(server.trim())) 
-      {
-        v.add(server.trim());      
-      }
-    }
-    else
-    {
-      Vector vect = new Vector();
-      vect.add(server.trim());
-      serversByType_.put(typeId, vect);
-    }
-
-  }
-
-  /**
-  * Gets the Web service servers vector given a type
-  * @param Web service type
-  * @return array of server factory Ids
-  */
-  public String[] getServerFactoryIdsByType(String webServiceType) 
-  {
-    String[] servers; 
-    if (serversByType_.containsKey(webServiceType))
-    {
-      Vector vect = (Vector)serversByType_.get(webServiceType);
-      servers = new String[vect.size()];
-      for (int i=0; i<vect.size(); i++)
-      {
-        String serverId = (String)vect.elementAt(i);
-        WebServiceServer wss = (WebServiceServer)webServiceServers.get(serverId);
-        if (wss!=null) {
-          servers[i] = (String)wss.getFactoryId(); //Note: returning server factory Ids
-        }
-      }
-      return servers;
-    }
-    else
-    {     
-      log_.log(Log.ERROR, 5060, this, "getServerByType", "Web service server not found for Web service type "+webServiceType);
-      return null;
-    }
-
-  }
-
-  public IWebServiceRuntime getWebServiceRuntimeByLabel(String runtimeLabel)
-  {
-    Iterator iter = webServiceRuntimes.values().iterator();
-    while (iter.hasNext())
-    {
-      WebServiceRuntime wsr = (WebServiceRuntime)iter.next();
-      if (wsr!=null) {
-        if (runtimeLabel.equals(wsr.getLabel()))
-          return wsr;
-      }
-    }
-    return null;      
-  }
-  
-  public IWebServiceRuntime getWebServiceRuntimeById(String runtimeId)
-  {
-    return (IWebServiceRuntime)webServiceRuntimes.get(runtimeId); 
-  }
-
-  public IWebServiceServer getWebServiceServerByFactoryId(String serverFactoryId)
-  {
-    if (serverFactoryId==null)
-      return null;
-
-    Iterator iter = webServiceServers.values().iterator();
-    while (iter.hasNext())
-    {
-      WebServiceServer wss = (WebServiceServer)iter.next();
-      if (wss!=null && wss.getFactoryId()!=null) {
-        if (serverFactoryId.equals(wss.getFactoryId())) {
-          return wss;
-        }
-      }
-    }
-    return null;    
-    
-  }
-
-  public IWebServiceServer getWebServiceServerByLabel(String serverLabel)
-  {
-    if (serverLabel==null) 
-      return null;
-    
-    Iterator iter = webServiceServers.values().iterator();
-    while (iter.hasNext())
-    {
-      WebServiceServer wss = (WebServiceServer)iter.next();
-      if (wss!=null) {
-        if (serverLabel.equals(wss.getLabel()))
-          return wss;
-      }
-    }
-    return null;    
-    
-  }
-  
-  public IWebServiceServer getWebServiceServerById(String serverId)
-  {
-    return (IWebServiceServer)webServiceServers.get(serverId);
-  }
-
-  public IWebServiceType getWebServiceTypeByLabel(String typeLabel)
-  {
-    Iterator iter = webServiceTypes.values().iterator();
-    while (iter.hasNext())
-    {
-      WebServiceTypeImpl wst = (WebServiceTypeImpl)iter.next();
-      if (wst!=null) {
-        if (typeLabel.equals(wst.getLabel()))
-          return wst;
-      }
-    }
-    return null;
-  }
-
-  public IWebServiceType getWebServiceTypeById(String typeId)
-  {
-    if (webServiceTypes.get(typeId)!= null)
-      return (WebServiceTypeImpl)webServiceTypes.get(typeId);
-    return null;
-  }
-
-  /**
-   * Returns true if an EJB project is needed to host a Web service
-   * of the type identified by typeId. If multiple natureIds are specified in the 
-   * "includeNatures" attribute, only the first one is checked. If no natureIds are specified, 
-   * false is returned.
-   * 
-   * @deprecated  
-   * 	Should be refactored in future 
-   */
-  public boolean requiresEJBProject(String typeId)
-  {
-    IWebServiceType wst = WebServiceServerRuntimeTypeRegistry.getInstance().getWebServiceTypeById(typeId);
-    if (wst != null)
-    {
-      IConfigurationElement elem = wst.getConfigurationElement();
-      String includedNatures = elem.getAttribute("includeNatures");
-      if (includedNatures==null || includedNatures.length()==0)
-      {
-        return false;
-      }
-      else
-      {
-        StringTokenizer st = new StringTokenizer(includedNatures);
-        if(st.hasMoreTokens())
-        {
-          String firstIncludedNature = st.nextToken();
-          if (firstIncludedNature.equals(IEJBNatureConstants.NATURE_ID))
-            return true;
-        }
-      }
-    }
-    return false;
-  }
-  
-  /**
-   * Returns a list of valid projects for the Web service type with an id of typeId.
-   * In the case where the Web service type extension does not specify which project
-   * natures are included, a array of all Web and EJB projects in the workspace will
-   * be returned.
-   * @param typeId
-   * @return IProject[] an array of valid projects
-   */
-  public IProject[] getProjectsByWebServiceType(String typeId)
-  {
-    IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
-    ArrayList validProjects = new ArrayList();
-//    IWebServiceType wst = WebServiceServerRuntimeTypeRegistry.getInstance().getWebServiceTypeById(typeId);
-//    if (wst != null)
-//    {
-
-		//TODO: This section needs to be refactored to filter ArtifactEdits
-		// and uphold project topology described in the extension
-		
-//      IConfigurationElement elem = wst.getConfigurationElement();
-//      String includedNatures = elem.getAttribute("includeNatures");
-//      String excludedNatures = elem.getAttribute("excludeNatures");
-//      if (includedNatures!=null && includedNatures.length()>0)
-//      {
-//        for (int i = 0; i < projects.length; i++)
-//        {
-//          if (include(projects[i], includedNatures) && exclude(projects[i], excludedNatures))
-//            validProjects.add(projects[i]);
-//        }
-//        return (IProject[])validProjects.toArray(new IProject[0]);
-//      }
-//    }
-    
-    //If wst was null or the extension didn't specify which project natures are
-    // to be included, revert to the old behaviour
-    for (int j = 0; j < projects.length; j++)
-    {
-      if (ResourceUtils.isWebProject(projects[j]) || ResourceUtils.isEJBProject(projects[j]))
-        validProjects.add(projects[j]);
-    }    
-    return (IProject[])validProjects.toArray(new IProject[0]);
-  }
-  
-  private boolean include(IProject project, String include)
-  {
-    StringTokenizer st = new StringTokenizer(include);
-    while(st.hasMoreTokens())
-    {
-      try
-      {
-        if (project.hasNature(st.nextToken()))
-          return true;
-      }
-      catch (CoreException ce)
-      {
-      }
-    }
-    return false;
-  }
-
-  private boolean exclude(IProject project, String exclude)
-  {
-    StringTokenizer st = new StringTokenizer(exclude);
-    while(st.hasMoreTokens())
-    {
-      try
-      {
-        if (project.hasNature(st.nextToken()))
-          return false;
-      }
-      catch (CoreException ce)
-      {
-      }
-    }
-    return true;
-  }
-  
-  //
-  // Loads WebServiceServerRuntimeType objects into this registry.
-  // See method getInstance().
-  //
-  private void load ()
-  {
-    runtimesByType_ = new Hashtable();
-    serversByType_ = new Hashtable();
-    configElemsById_ = new Hashtable();
-    runtimeIdByLabel_ = new Hashtable();
-    runtimeLabelById_ = new Hashtable();
-    serverFactoryIdByLabel_ = new Hashtable();
-    serverLabelByFactoryId_ = new Hashtable();
-
-    webServiceServers = new HashMap();
-    webServiceRuntimes = new HashMap();
-    webServiceTypes = new HashMap();
-    
-    webServiceServerRuntimeTypes = new HashMap();
-    
-    loadTypes();
-  }
-
-  /**
-  * Returns a singleton instance of this class.
-  * @return A singleton WebServiceServerRuntimeTypeRegistry object.
-  */
-  public static WebServiceServerRuntimeTypeRegistry getInstance ()
-  {
-    if (instance_ == null)
-    {
-      instance_ = new WebServiceServerRuntimeTypeRegistry();
-      instance_.load();
-    }
-    return instance_;
-  }
-
-  /**
-  * Returns the Web Service type names of all registered <code>WebServiceServerRuntimeType</code>
-  * objects.
-  * @return The Web Service type names of all registered <code>WebServiceServerRuntimeType</code>
-  * objects.
-  */
-  public String[] getWebServiceTypeNames()
-  {
-    
-    String[] types = new String[webServiceTypes.size()];
-
-    int i=0;
-    Iterator iter = webServiceTypes.values().iterator();
-    while (iter.hasNext())
-    {
-      WebServiceTypeImpl wst = (WebServiceTypeImpl)iter.next();
-      if (wst!=null) {
-        types[i] = wst.getLabel();
-        i++;
-      }
-    }
-    return types;
-  }
-  
-  public LabelsAndIds getServiceTypeLabels()
-  {
-    LabelsAndIds labelIds = new LabelsAndIds();
-    Iterator     iterator = webServiceTypes.values().iterator();
-    int          size     = webServiceTypes.size();
-    String[]     labels   = new String[size];
-    String[]     ids      = new String[size];
-    int          index    = 0;
-    
-    labelIds.setLabels_( labels );
-    labelIds.setIds_( ids );
-    
-    while( iterator.hasNext() ) 
-    {
-      WebServiceTypeImpl type = (WebServiceTypeImpl)iterator.next();
-      
-      ids[index]    = type.getId();
-      labels[index] = type.getLabel();
-      index++;
-    }    
-    
-    return labelIds;
-  }
-  
-  /**
-  * Returns the IConfigurationElement given the server, runtime, and type attributes
-  * The benefit of getting the IConfigurationElement is that the corresponding class
-  * file and plugin are not loaded immediately.
-  * @param server label
-  * @param runtime label
-  * @param type label
-  * @return IConfiguration element
-  */
-  public IConfigurationElement getConfigurationElementFor(String serverId, String runtimeId, String typeId)
-  {
-    if (serverId==null || runtimeId==null || typeId==null)
-        return null;
-    Iterator iter = webServiceServerRuntimeTypes.values().iterator();
-    while (iter.hasNext())
-    {
-      WebServiceServerRuntimeType_ wssrt = (WebServiceServerRuntimeType_)iter.next();
-      if (wssrt!=null ) {
-        if (wssrt.getConfigurationElementFor(serverId, runtimeId, typeId)!=null)
-          return wssrt.getConfigurationElementFor(serverId, runtimeId,typeId);
-      }
-    }
-    return null;    
-  }
-  
-  public IConfigurationElement getConfigElementFor(String factoryId, String runtimeId, String typeId)
-  {
-    Iterator iter = webServiceServerRuntimeTypes.values().iterator();
-    while (iter.hasNext())
-    {
-      WebServiceServerRuntimeType_ wssrt = (WebServiceServerRuntimeType_)iter.next();
-        if (wssrt.hasConfigElementFor(factoryId, runtimeId, typeId)) {
-          return wssrt.element_;
-      }
-    }
-    return null;    
-  }
-
-  public boolean requiresWebModuleFor(String server, String runtime, String type)
-  {
-    IConfigurationElement elem = getConfigurationElementFor(server, runtime, type);
-    if (elem==null)
-    {
-      return false;  // report error here instead
-    }
-    return Boolean.valueOf(elem.getAttribute("requireWebModule")).booleanValue();
-  }
-
-  public boolean requiresEJBModuleFor(String server, String runtime, String type)
-  {
-    IConfigurationElement elem = getConfigurationElementFor(server, runtime, type);    
-    if (elem==null)
-    {
-      return false;
-    }
-    return Boolean.valueOf(elem.getAttribute("requireEJBModule")).booleanValue();
-  }
-
-  /**
-  * Returns the id of the <code>WebServiceServerRuntimeType</code> corresponding to the Server,
-  * Runtime, and Web Service Type.
-  */
-  public boolean webServiceServerRuntimeTypeExists(String serverID, String runtimeID, String typeID) 
-  {
-    return (getConfigurationElementFor(serverID, runtimeID, typeID) != null);
-  }
-
-  /**
-  * Returns the id of the <code>WebServiceServerRuntimeType</code> corresponding to the Server,
-  * Runtime, and Web Service Type.
-  */
-  public String getWebServiceServerRuntimeTypeName(String server, String runtime, String type) 
-  {
-    IConfigurationElement elem = (IConfigurationElement)getConfigurationElementFor(server, runtime, type);
-    return (elem==null ? null : elem.getAttribute("id"));
-  }
-
-  /**
-  * Returns the <code>WebServiceServerRuntimeType</code> corresponding to the Server, 
-  * Runtime, and Web Service type. This will return the <code>WebServiceServerRuntimeType</code>
-  * object and set the properties found in the manifest file. i.e. isWebModuleRequired, isEJBModuleRequired
-  * @param server label
-  * @param runtime label
-  * @param Web service type
-  * @return WebServiceServerRuntimeType object
-  */
-  public WebServiceServerRuntimeType getWebServiceServerRuntimeType(String server, String runtime, String type)
-  {
-
-    WebServiceServerRuntimeType wssrt = null;
-    String serverId = getWebServiceServerByFactoryId(server).getId();
-    IConfigurationElement elem = getConfigurationElementFor(server, runtime, type);
-   
-    if( elem == null )
-    {
-      // We couldn't find the server and runtime specified so we will
-      // find the default server and runtime.
-      
-      server  = getDefaultServerValueFor(type);
-      runtime = getDefaultRuntimeValueFor(type);
-
-      elem = getConfigurationElementFor(server, runtime, type);
-      
-    }
-   
-    return wssrt;
-
-  }
-
-
-  /**
-  * Returns the <code>WebServiceServerRuntimeType</code> given the type name.
-  * @param type name
-  * @retrun WebServiceServerRuntimeType object
-  */
-  public WebServiceServerRuntimeType getWebServiceServerRuntimeTypeById(String id)
-  {
-    WebServiceServerRuntimeType wssrt = null;
-    if (configElemsById_.containsKey(id))
-    {
-      try {
-        IConfigurationElement elem = (IConfigurationElement)configElemsById_.get(id);
-        Object webServiceType = elem.createExecutableExtension("class");
-        if (webServiceType instanceof WebServiceServerRuntimeType) 
-        {
-          wssrt = (WebServiceServerRuntimeType)webServiceType;
-          wssrt.setServerLabel(elem.getAttribute("server"));
-          wssrt.setRuntimeLabel(elem.getAttribute("runtime"));
-          wssrt.setWebModuleRequired( Boolean.valueOf(elem.getAttribute("requireWebModule")).booleanValue() );
-          wssrt.setEJBModuleRequired( Boolean.valueOf(elem.getAttribute("requireEJBModule")).booleanValue() );
-        }
-        else
-        {
-          String implementedInterface = "org.eclipse.jst.ws.ui.wizard.WebServiceServerRuntimeType ";
-          String errMsg = "Extensions of the WebServiceServerRuntimeTypes extension point must implement the ";
-          errMsg = errMsg + implementedInterface + "interface.";
-          log_.log(Log.ERROR, 5061, this, "getWebServiceServerRuntimeTypeById", errMsg);
-        }
-      }
-      catch (CoreException ce)
-      {
-        log_.log(Log.ERROR, 5062, this, "getWebServiceServerRuntimeTypeById", ce);
-      }
-    }
-
-    return wssrt;
-  }
-
-  public String[] getWebServiceTypeBySelection(IStructuredSelection selection)
-  {
-
-    TypeSelectionFilter tsf = new TypeSelectionFilter();
-    String[] wst = tsf.getWebServiceTypeByInitialSelection(selection, webServiceTypes);
-    return wst == null ? null : wst;
-
-  }
-
-  public IWebServiceType getWebServiceTypeByTypeLabel(String webServiceTypeLabel)
-  {
-
-    Iterator iter = webServiceTypes.values().iterator();
-    while (iter.hasNext())
-    {
-      WebServiceTypeImpl wst = (WebServiceTypeImpl)iter.next();
-      if (wst!=null) {
-        if (wst.getLabel().equals(webServiceTypeLabel)) {
-          return wst; 
-        }
-      }
-    }
-    return null;
-  }
-
-  public boolean isInitialSelectionValidForChosenType(IStructuredSelection selection, String typeName)
-  {
-    String[] supportedTypes = getWebServiceTypeBySelection(selection);
-    if (supportedTypes!=null)
-    {
-      for (int i=0; i<supportedTypes.length; i++)
-      {
-        if (supportedTypes[i].equals(typeName))
-          return true;
-      }
-    }
-    return false;
-
-  }
-
-  public boolean isServerSupportedForChosenType(String typeId, String serverID)
-  {
-    if (serversByType_.containsKey(typeId))
-    {
-      Vector vect = (Vector)serversByType_.get(typeId);
-      for (int i=0; i<vect.size(); i++)
-      {
-        WebServiceServer wss = (WebServiceServer)webServiceServers.get((String)vect.elementAt(i));
-        if (serverID!=null) {
-          if (serverID.equalsIgnoreCase(wss.getFactoryId()))
-            return true;
-        }
-      }
-    }
-    return false;
-  }
-  
-  public boolean isServerRuntimeTypeSupported(String server, String runtime, String type)  {
-
-      WebServiceServerRuntimeType wssrt = null;
-      IConfigurationElement elem = getConfigurationElementFor(server, runtime, type);
-      return elem == null ? false : true; 
-          
-  }
-  
-  public String getDefaultServerValueFor(String typeId)
-  {
-    String[] servers; 
-    if (serversByType_.containsKey(typeId))
-    {
-      Vector vect = (Vector)serversByType_.get(typeId);
-      servers = new String[vect.size()];
-      for (int i=0; i<vect.size(); i++)
-      {
-        String serverId = (String)vect.elementAt(i);
-        WebServiceServer wss = (WebServiceServer)webServiceServers.get(serverId);
-        servers[i] = (String)wss.getId();
-      }
-      return servers[0];
-    }
-    else
-    {
-      log_.log(Log.ERROR, 5063, this, "getServerByType", "Unable to find default server for "+typeId);
-      return null;
-    }
-
-  }
-
-  public String getDefaultRuntimeValueFor(String typeId)
-  {
-    String[] runtimeName = getRuntimesByType(typeId);
-    for (int i=0; i<runtimeName.length; i++)
-    {
-        WebServiceRuntime wsr = (WebServiceRuntime)webServiceRuntimes.get(runtimeName[i]);
-        if (wsr.getIsDefault())
-        	return runtimeName[i];
-    }   
-    return runtimeName[0];
-  }
-  
-  public String getServerIdForFactoryId(String factoryId) {
-
-    Iterator iter = webServiceServers.values().iterator();
-    while (iter.hasNext()) {
-      WebServiceServer wss = (WebServiceServer)iter.next();
-      if (wss.getFactoryId().equals(factoryId)) {
-        return wss.getId();
-      }
-    }
-    return null;
-
-  }
- 
-  public final class WebServiceServerRuntimeType_
-  {
-    
-   public String typeId_;
-   public String serverId_;
-   public String runtimeId_;
-   public IConfigurationElement element_;
-   
-   public WebServiceServerRuntimeType_(String serverId, String runtimeId,String typeId, IConfigurationElement elem)
-   {
-    this.typeId_ = typeId;
-    this.serverId_ = serverId;
-    this.runtimeId_ = runtimeId;
-    this.element_ = elem;
-   }
-    
-   public IConfigurationElement getConfigurationElementFor(String serverID, String runtimeID, String typeID)
-   {
-    if (this.typeId_.equals(typeID) && this.serverId_.equals(serverID) && this.runtimeId_.equals(runtimeID))
-      return this.element_;
-    return null;
-   }
-   
-   public boolean hasConfigElementFor(String factoryID, String runtimeID, String typeID) 
-   {
-     String serverID = getServerIdForFactoryId( factoryID ); 
-       
-     if (typeId_.equalsIgnoreCase(typeID) &&
-         serverId_.equalsIgnoreCase(serverID) &&
-         runtimeId_.equalsIgnoreCase(runtimeID))
-     {
-        return true;
-     }
-     
-     return false;
-    }
-    
-    
-  }
-
-  public CommandFragmentFactoryFactory getFactoryFactory( String[] ids )
-  {
-    String                hashKey = ids[2] + "#" + ids[1] + "#" + ids[0];
-    CommandWidgetBinding  binding = (CommandWidgetBinding)factoryCache_.get( hashKey );
-    
-    if( binding == null ) 
-    {
-      IConfigurationElement element = getConfigElementFor( ids[2], ids[1], ids[0] ); 
-    
-      if( element == null ) return null;
-    
-      binding = createBinding( element );
-      
-      factoryCache_.put( hashKey, binding );
-      
-      binding.registerDataMappings( dataMappingRegistry_ );
-      
-      if( widgetRegistry_ != null )
-      {
-        binding.registerWidgetMappings( widgetRegistry_ );
-        binding.registerCanFinish( canFinishRegistry_ );
-      }
-    }
-         
-    return binding;    
-  }
-  
-  private CommandWidgetBinding createBinding(IConfigurationElement element ) 
-  {
-    Vector bindings = new Vector(4);
-    Vector fragments = new Vector(4);
-    
-    addBinding( element, "developBinding", bindings );
-    addBinding( element, "assemblyBinding", bindings );
-    addBinding( element, "deployBinding", bindings );
-    addBinding( element, "installBinding", bindings );
-    
-    fragments.add( new ServicePreDevelopFragment() );
-    fragments.add( new ServicePreAssemblyFragment() );
-    fragments.add( new ServicePreDeployFragment() );
-    fragments.add( new ServicePreInstallFragment() );
-     
-    return new CommandWidgetBindingList( bindings, fragments );
-  }
-  
-  private void addBinding( IConfigurationElement element, String bindingName, Vector list )
-  {
-    Object binding = null;
-    
-    if( element.getAttribute( bindingName ) != null )
-    {
-      try
-      {
-        binding = element.createExecutableExtension( bindingName ); 
-      }
-      catch( CoreException exc )
-      {
-      }
-    }
-    
-    list.add( binding );
-  }
-  
-  public void setDataMappingRegistry( DataMappingRegistry registry )
-  {
-    dataMappingRegistry_ = registry;
-    
-    // We need to rebuild the factory cache each time we start the server
-    // wizard.
-    factoryCache_        = new HashMap();
-  }
-  
-  public void setWidgetRegistry( WidgetRegistry registry )
-  {
-    widgetRegistry_ = registry;;  
-  }
-  
-  public void setCanFinishRegistry( CanFinishRegistry registry )
-  {
-    canFinishRegistry_ = registry;
-  }
-
-  public String[] getAllServerFactoryIds()
-  {
-  	Object[] servers = webServiceServers.values().toArray();
-  	String[] factoryIds = new String[servers.length];
-  	for (int i=0; i<servers.length; i++)
-  	{
-  		WebServiceServer wss = (WebServiceServer)servers[i];
-  		factoryIds[i] = wss.getFactoryId();
-  	}
-  	return factoryIds;
-  }
-  
-  public String getServerFactoryIdFromServerId(String serverId)
-  {
-  	Object[] servers = webServiceServers.values().toArray();
-  	for (int i=0; i<servers.length; i++)
-  	{
-  		WebServiceServer wss = (WebServiceServer)servers[i];
-  		if (serverId == wss.getId())
-  		{
-  			return wss.getFactoryId();
-  		}
-  			
-  	}
-  	return null;
-  }
-  
-  /*
-   * Returns a cascading list of valid choices for server, runtime, and J2EE levels. 
-   * This is an intersection of what is available for service and client. 
-   */
-  public SelectionListChoices getServerToRuntimeToJ2EE()
-  {
-  	if (serverToRuntimeToJ2EE_!=null)
-  	{
-  		return serverToRuntimeToJ2EE_;
-  	}
-  	
-  	String[] servers = getStringArrayIntersection(getAllServerFactoryIds(), WebServiceClientTypeRegistry.getInstance().getAllClientServerFactoryIds());
-    SelectionList serversList = new SelectionList(servers, 0);
-    Vector choices = new Vector();
-    for (int i=0; i<servers.length; i++)
-    {
-    	choices.add(getRuntimeChoices(servers[i]));
-    }
-    serverToRuntimeToJ2EE_ = new SelectionListChoices(serversList, choices);
-    return serverToRuntimeToJ2EE_;
-  	
-  }
-  
-  private SelectionListChoices getRuntimeChoices(String serverFactoryId)
-  {
-  	String[] serviceRuntimes = getRuntimeIDsByServerFactoryID(serverFactoryId);
-  	String[] clientRuntimes = WebServiceClientTypeRegistry.getInstance().getRuntimeIdsByServerFactoryId(serverFactoryId);
-  	String[] runtimes = getStringArrayIntersection(serviceRuntimes, clientRuntimes);
-  	SelectionList runtimesList = new SelectionList(runtimes, 0);
-  	Vector choices = new Vector();
-    for (int i=0; i<runtimes.length; i++)
-    {
-    	choices.add(getJ2EEChoices(runtimes[i]));
-    }
-    return new SelectionListChoices(runtimesList, choices);    
-  }
-  
-  private SelectionListChoices getJ2EEChoices(String runtimeId)
-  {
-  	String[] serviceJ2EEVersions = getWebServiceRuntimeById(runtimeId).getJ2EEVersions();
-  	String[] clientJ2EEVersions = WebServiceClientTypeRegistry.getInstance().getWebServiceRuntimeById(runtimeId).getJ2EEVersions();
-  	String[] j2eeVersions = getStringArrayIntersection(serviceJ2EEVersions, clientJ2EEVersions);
-  	SelectionList j2eeVersionsList = new SelectionList(j2eeVersions, 0);
-  	return new SelectionListChoices(j2eeVersionsList, null);
-  }
-  
-  public String getServerLabel(String factoryId)
-  {
-  	if (factoryId==null || factoryId.length()==0)
-  		return null;
-  	
-  	if (serverLabelByFactoryId_.containsKey(factoryId))
-  	{
-  	  return (String)serverLabelByFactoryId_.get(factoryId);
-  	}
-  	else
-  	{
-  	  return null;
-  	}
-  }
-  
-  public String getServerFactoryId(String label)
-  {
-  	if (label==null || label.length()==0)
-  		return null;
-  	
-  	if (serverFactoryIdByLabel_.containsKey(label))
-  	{
-  	  return (String)serverFactoryIdByLabel_.get(label);  
-  	}
-  	else
-  	{
-  	  return null;
-  	}  	  	
-  }
-  
-  public String getRuntimeLabel(String id)
-  {
-  	if (id==null || id.length()==0)
-  		return null;
-  	
-  	return (String) runtimeLabelById_.get(id);
-  }
-  
-  public String getRuntimeId(String label)
-  {
-  	if (label==null || label.length()==0)
-  		return null;
-  	
-  	return (String)runtimeIdByLabel_.get(label);  	
-  }  
-  
-  private String[] getStringArrayIntersection(String[] a1, String[] a2)
-  {
-  	Vector vf = new Vector();
-  	if (a1==null || a2==null)
-  	{
-  		return convertToStringArray(vf.toArray());
-  	}  	
-  	
-  	for (int i=0; i<a1.length; i++)
-  	{
-  		for (int j=0; j<a2.length; j++)
-  		{
-  			if (a1[i].equals(a2[j]))
-  			{
-  				vf.add(a1[i]);
-  				break;
-  			}
-  		}
-  	}
-  	
-  	return convertToStringArray(vf.toArray());
-  }
-  
-  private String[] convertToStringArray(Object[] a)
-  {
-  	if (a==null) return new String[0];
-  	
-  	int length = a.length;
-  	String[] sa = new String[length];
-  	for (int i=0; i<length; i++)
-  	{
-  		Object obj = a[i];
-  		if (obj instanceof String)
-  		{
-  			sa[i] = (String)obj;
-  		}
-  	}
-  	return sa;
-  }
-}
-
-
-
-
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/WebServiceType.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/WebServiceType.java
deleted file mode 100644
index 3a8f4fb..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/WebServiceType.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.consumption.ui.wizard;
-
-
-/**
-* This is the interface for objects that represent a kind of
-* Web Service artifact. The primary purpose of a WebServiceType
-* object is to manufacture the wizard pages that support the type.
-*/
-public interface WebServiceType
-{
-  /**
-  * Returns a short, locale specific name of this Web Service type.
-  * @return A short, locale specific name of this Web Service type.
-  */
-  public String getName ();
-
-  /**
-  * Returns a locale specific description of this Web Service type.
-  * @return A locale specific description of this Web Service type.
-  */
-  public String getDescription ();
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/WebServiceTypeImpl.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/WebServiceTypeImpl.java
deleted file mode 100644
index 229de46..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/WebServiceTypeImpl.java
+++ /dev/null
@@ -1,143 +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.consumption.ui.wizard;
-
-import java.util.StringTokenizer;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-
-
-/**
-* This is the interface for objects that represent a kind of
-* Web Service artifact. The primary purpose of a WebServiceType
-* object is to manufacture the wizard pages that support the type.
-*/
-public class WebServiceTypeImpl implements IWebServiceType
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  public IConfigurationElement element_;
-  public String typeId_;
-  public String typeLabel_;
-  public String[] extensionMetadata_;
-  public String[] resourceTypeMetadata_;
-  public Boolean canFinish_;
-
-  public WebServiceTypeImpl(IConfigurationElement elem)
-  {
-    super();
-    this.element_ = elem; 
-  }
-  /**
-  * Returns the id of this Web Service type.
-  * @return id of this Web Service type.
-  */
-  public String getId ()
-  {
-    if (typeId_==null)
-      typeId_ = element_.getAttribute("id");
-    return typeId_;
-  }
-  /**
-  * Returns a short, locale specific name of this Web Service type.
-  * @return A short, locale specific name of this Web Service type.
-  */
-  public String getLabel ()
-  {
-    if (typeLabel_ == null)
-      typeLabel_ = element_.getAttribute("label");
-    return typeLabel_;    
-  }
-
-  /**
-  * Returns a locale specific description of this Web Service type's extension metadata.
-  * @return A locale specific description of this Web Service type's extension metadata.
-  */
-  public String[] getExtensionMetadata ()
-  {
-    if (extensionMetadata_ ==null)
-    {
-      StringTokenizer st = new StringTokenizer(element_.getAttribute("extensionMetadata"));
-      extensionMetadata_ = new String[st.countTokens()];
-      int i=0;
-      while (st.hasMoreElements())
-      {
-        String exten = (String)st.nextToken();
-        if (exten!=null)
-        {
-          extensionMetadata_[i]=exten;
-        }
-        i++;
-      }    
-    }
-    return this.extensionMetadata_;
-  }    
-
-  /**
-  * Returns a locale specific description of this Web Service type's resource metadata.
-  * @return A locale specific description of this Web Service type's resource metadata.
-  */
-  public String[] getResourceTypeMetadata ()
-  {
-    if (resourceTypeMetadata_ == null)
-    {
-      StringTokenizer st = new StringTokenizer(element_.getAttribute("resourceTypeMetadata"));    
-      resourceTypeMetadata_ = new String[st.countTokens()];
-      int i=0;
-      while (st.hasMoreElements())
-      {
-        String resourceType = (String)st.nextToken();
-        if (resourceType!=null)
-        {
-          resourceTypeMetadata_[i]=resourceType;
-        }
-        i++;
-      }
-    }
-    return resourceTypeMetadata_;
-  }
-
-  /**
-  * Returns true if the plugin.xml contains an attribute of "canFinish" with a value of true.  Otherwise, 
-  * false is returned.  Note: if the "canFinish" attribute is not specified true is returned by default.
-  * @return Returns whether or not the user can finish on the pages before the web service type pages.
-  */
-  public boolean getCanFinish()
-  {
-    if( canFinish_ == null )
-    {      
-      String canFinishString = element_.getAttribute("canFinish");
-
-      canFinish_ = canFinishString == null ? new Boolean( true ) : Boolean.valueOf( canFinishString );
-    }
-
-    return canFinish_.booleanValue();
-  }
-  
-  /**
-   * Returns the configuration element associated with
-   * this type.
-   * 
-   * @return org.eclipse.core.runtime.IConfigurationElement
-   */
-  public IConfigurationElement getConfigurationElement()
-  {
-    return this.element_; 
-  }
-
-  public String getObjectSelectionWidget()
-  {
-    return element_.getAttribute("objectSelectionWidget");
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/WebServiceTypeRegistry.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/WebServiceTypeRegistry.java
deleted file mode 100644
index fbc3fef..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/WebServiceTypeRegistry.java
+++ /dev/null
@@ -1,161 +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.consumption.ui.wizard;
-
-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;
-import org.eclipse.wst.command.env.core.common.Log;
-import org.eclipse.wst.command.env.eclipse.EclipseLog;
-
-public class WebServiceTypeRegistry
-{
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-  private static WebServiceTypeRegistry instance_;
-
-  private Hashtable typesByName_;
-  private String[] typeNames_;
-
-  //
-  // 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 loadTypes ()
-  {
-  	Log log = new EclipseLog();
-    IExtensionRegistry reg = Platform.getExtensionRegistry();
-    IConfigurationElement[] config = reg.getConfigurationElementsFor(
-                                     "org.eclipse.jst.ws.consumption.ui",
-                                     "webServiceType");
-
-    for(int idx=0; idx<config.length; idx++) 
-    {
-      IConfigurationElement elem = config[idx];
-      try 
-      {
-        Object webServiceType = elem.createExecutableExtension("class");
-        if (webServiceType instanceof WebServiceType) 
-        {
-          add((WebServiceType)webServiceType);
-        }
-        else
-        {
-          String implementedInterface = "org.eclipse.jst.ws.ui.wizard.WebServiceType ";
-          String errMsg = "Extensions of the webServiceTypes extension point must implement the ";
-          errMsg = errMsg + implementedInterface + "interface.";
-      	  log.log(Log.ERROR, 5056, this, "loadTypes", errMsg);
-        }
-      } catch (CoreException e)
-      {
-      	log.log(Log.ERROR, 5057, this, "loadTypes", e);
-      }
-    }
-  }
-
-  //
-  // Loads WebServiceType objects into this registry.
-  // See method getInstance().
-  //
-  private void load ()
-  {
-    typesByName_ = new Hashtable();
-    loadTypes();
-    indexTypesByName();
-  }
-
-  //
-  // Add the given WebServiceType to this registry.
-  // See method load().
-  //
-  private void add ( WebServiceType wst )
-  {
-    typesByName_.put(wst.getName(),wst);
-  }
-
-  //
-  // Builds an index of WebServiceType objects by their names.
-  // See method load().
-  //
-  private void indexTypesByName ()
-  {
-    if (typeNames_ == null)
-    {
-      typeNames_ = new String[typesByName_.size()];
-      Enumeration e = typesByName_.keys();
-      for (int i=0; e.hasMoreElements(); i++)
-      {
-        typeNames_[i] = (String)e.nextElement();
-      }
-    }
-  }
-
-  /**
-  * Returns a singleton instance of this class.
-  * @return A singleton WebServiceTypeRegistry object.
-  */
-  public static WebServiceTypeRegistry getInstance ()
-  {
-    if (instance_ == null)
-    {
-      instance_ = new WebServiceTypeRegistry();
-      instance_.load();
-    }
-    return instance_;
-  }
-
-  /**
-  * Returns all registered <code>WebServiceType</code> objects.
-  * @return All registered <code>WebServiceType</code> objects.
-  */
-  public WebServiceType[] getWebServiceTypes ()
-  {
-    WebServiceType[] wsts = new WebServiceType[typesByName_.size()];
-    Enumeration e = typesByName_.elements();
-    for (int i=0; e.hasMoreElements(); i++)
-    {
-      wsts[i] = (WebServiceType)e.nextElement();
-    }
-    return wsts;
-  }
-
-  /**
-  * Returns the names of all registered <code>WebServiceType</code>
-  * objects.
-  * @return The names of all registered <code>WebServiceType</code>
-  * objects.
-  */
-  public String[] getWebServiceTypeNames ()
-  {
-    return typeNames_;
-  }
-
-  /**
-  * Returns the <code>WebServiceType</code> object of the given
-  * <code>name</code> or null if there is no such object.
-  * @param name The name of the <code>WebServiceType</code> to find.
-  * @return The <code>WebServiceType</code> or null if no such object
-  * was found.
-  */
-  public WebServiceType getWebServiceTypeByName ( String name )
-  {
-    return (name == null ? null : (WebServiceType)typesByName_.get(name));
-  }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryIBM.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryIBM.java
deleted file mode 100644
index dbea13b..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryIBM.java
+++ /dev/null
@@ -1,41 +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.consumption.ui.wizard.uddi;
-
-import org.eclipse.wst.ws.WSPlugin;
-
-public class PublicUDDIRegistryIBM implements PublicUDDIRegistryType
-{
-
-    // Copyright
-    public static final String copyright = "(c) Copyright IBM Corporation 2002.";
-
-    public PublicUDDIRegistryIBM() {
-    }
-
-    public String getName() {
-        return WSPlugin.getResourceString("%PUBLICUDDIREGISTRYTYPE_NAME_IBM");
-    }
-
-    public String getInquiryURL() {
-        return "http://uddi.ibm.com/ubr/inquiryapi";
-    }
-
-    public String getPublishURL() {
-        return "https://uddi.ibm.com/ubr/publishapi";
-    }
-
-    public String getRegistrationURL() {
-        return "http://uddi.ibm.com/ubr/registry.html";
-    }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryIBMTest.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryIBMTest.java
deleted file mode 100644
index 64e9fb9..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryIBMTest.java
+++ /dev/null
@@ -1,41 +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.consumption.ui.wizard.uddi;
-
-import org.eclipse.wst.ws.WSPlugin;
-
-public class PublicUDDIRegistryIBMTest implements PublicUDDIRegistryType
-{
-
-    // Copyright
-    public static final String copyright = "(c) Copyright IBM Corporation 2002.";
-
-    public PublicUDDIRegistryIBMTest() {
-    }
-
-    public String getName() {
-        return WSPlugin.getResourceString("%PUBLICUDDIREGISTRYTYPE_NAME_IBM_TEST");
-    }
-
-    public String getInquiryURL() {
-        return "http://uddi.ibm.com/testregistry/inquiryapi";
-    }
-
-    public String getPublishURL() {
-        return "https://uddi.ibm.com/testregistry/publishapi";
-    }
-
-    public String getRegistrationURL() {
-        return "http://uddi.ibm.com/testregistry/registry.html";
-    }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryMicrosoft.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryMicrosoft.java
deleted file mode 100644
index 125dcc6..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryMicrosoft.java
+++ /dev/null
@@ -1,41 +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.consumption.ui.wizard.uddi;
-
-import org.eclipse.wst.ws.WSPlugin;
-
-public class PublicUDDIRegistryMicrosoft implements PublicUDDIRegistryType
-{
-
-    // Copyright
-    public static final String copyright = "(c) Copyright IBM Corporation 2002.";
-
-    public PublicUDDIRegistryMicrosoft() {
-    }
-
-    public String getName() {
-        return WSPlugin.getResourceString("%PUBLICUDDIREGISTRYTYPE_NAME_MICROSOFT");
-    }
-
-    public String getInquiryURL() {
-        return "http://uddi.microsoft.com/inquire";
-    }
-
-    public String getPublishURL() {
-        return "https://uddi.microsoft.com/publish";
-    }
-
-    public String getRegistrationURL() {
-        return "https://uddi.microsoft.com/register.aspx";
-    }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryMicrosoftTest.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryMicrosoftTest.java
deleted file mode 100644
index 07a9351..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryMicrosoftTest.java
+++ /dev/null
@@ -1,41 +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.consumption.ui.wizard.uddi;
-
-import org.eclipse.wst.ws.WSPlugin;
-
-public class PublicUDDIRegistryMicrosoftTest implements PublicUDDIRegistryType
-{
-
-    // Copyright
-    public static final String copyright = "(c) Copyright IBM Corporation 2002.";
-
-    public PublicUDDIRegistryMicrosoftTest() {
-    }
-
-    public String getName() {
-        return WSPlugin.getResourceString("%PUBLICUDDIREGISTRYTYPE_NAME_MICROSOFT_TEST");
-    }
-
-    public String getInquiryURL() {
-        return "http://test.uddi.microsoft.com/inquire";
-    }
-
-    public String getPublishURL() {
-        return "https://test.uddi.microsoft.com/publish";
-    }
-
-    public String getRegistrationURL() {
-        return "http://test.uddi.microsoft.com/register.aspx";
-    }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryNTTComm.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryNTTComm.java
deleted file mode 100644
index 4dcca6e..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryNTTComm.java
+++ /dev/null
@@ -1,41 +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.consumption.ui.wizard.uddi;
-
-import org.eclipse.wst.ws.WSPlugin;
-
-public class PublicUDDIRegistryNTTComm implements PublicUDDIRegistryType
-{
-
-    // Copyright
-    public static final String copyright = "(c) Copyright IBM Corporation 2002.";
-
-    public PublicUDDIRegistryNTTComm() {
-    }
-
-    public String getName() {
-        return WSPlugin.getResourceString("%PUBLICUDDIREGISTRYTYPE_NAME_NTTCOMM");
-    }
-
-    public String getInquiryURL() {
-        return "http://www.uddi.ne.jp/ubr/inquiryapi";
-    }
-
-    public String getPublishURL() {
-        return "https://www.uddi.ne.jp/ubr/publishapi";
-    }
-
-    public String getRegistrationURL() {
-        return "http://www.ntt.com/uddi/";
-    }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistrySAP.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistrySAP.java
deleted file mode 100644
index 9ceb8ee..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistrySAP.java
+++ /dev/null
@@ -1,41 +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.consumption.ui.wizard.uddi;
-
-import org.eclipse.wst.ws.WSPlugin;
-
-public class PublicUDDIRegistrySAP implements PublicUDDIRegistryType
-{
-
-    // Copyright
-    public static final String copyright = "(c) Copyright IBM Corporation 2002.";
-
-    public PublicUDDIRegistrySAP() {
-    }
-
-    public String getName() {
-        return WSPlugin.getResourceString("%PUBLICUDDIREGISTRYTYPE_NAME_SAP");
-    }
-
-    public String getInquiryURL() {
-        return "http://uddi.sap.com/UDDI/api/inquiry/";
-    }
-
-    public String getPublishURL() {
-        return "https://uddi.sap.com/UDDI/api/publish/";
-    }
-
-    public String getRegistrationURL() {
-        return "http://uddi.sap.com/";
-    }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistrySAPTest.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistrySAPTest.java
deleted file mode 100644
index db8bdc9..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistrySAPTest.java
+++ /dev/null
@@ -1,41 +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.consumption.ui.wizard.uddi;
-
-import org.eclipse.wst.ws.WSPlugin;
-
-public class PublicUDDIRegistrySAPTest implements PublicUDDIRegistryType
-{
-
-    // Copyright
-    public static final String copyright = "(c) Copyright IBM Corporation 2002.";
-
-    public PublicUDDIRegistrySAPTest() {
-    }
-
-    public String getName() {
-        return WSPlugin.getResourceString("%PUBLICUDDIREGISTRYTYPE_NAME_SAP_TEST");
-    }
-
-    public String getInquiryURL() {
-        return "http://udditest.sap.com/UDDI/api/inquiry/";
-    }
-
-    public String getPublishURL() {
-        return "https://udditest.sap.com/UDDI/api/publish/";
-    }
-
-    public String getRegistrationURL() {
-        return "http://udditest.sap.com/";
-    }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryType.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryType.java
deleted file mode 100644
index e4d9e65..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryType.java
+++ /dev/null
@@ -1,25 +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.consumption.ui.wizard.uddi;
-
-public interface PublicUDDIRegistryType
-{
-
-    // Copyright
-    public static final String copyright = "(c) Copyright IBM Corporation 2002.";
-
-    public String getName();
-    public String getInquiryURL();
-    public String getPublishURL();
-    public String getRegistrationURL();
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryXMethods.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryXMethods.java
deleted file mode 100644
index cc70d38..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryXMethods.java
+++ /dev/null
@@ -1,43 +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.consumption.ui.wizard.uddi;
-
-import org.eclipse.wst.ws.WSPlugin;
-
-public class PublicUDDIRegistryXMethods implements PublicUDDIRegistryType
-{
-
-    // Copyright
-    public static final String copyright = "(c) Copyright IBM Corporation 2002.";
-
-    public PublicUDDIRegistryXMethods() {
-    }
-
-    public String getName() {
-        return WSPlugin.getResourceString("%PUBLICUDDIREGISTRYTYPE_NAME_XMETHODS");
-    }
-
-    public String getInquiryURL() {
-        //return "http://uddi.xmethods.net/inquire";
-        return "http://uddi.xmethods.net/inquire2";
-    }
-
-    // Read-only registry. The publish and registration URLs don't exist.
-    public String getPublishURL() {
-        return "https://uddi.xmethods.net/publish2";
-    }
-
-    public String getRegistrationURL() {
-        return "http://www.xmethods.net/ve2/Register.po?event=registerOrg";
-    }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/AddWSDLToWSILWrapperCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/AddWSDLToWSILWrapperCommand.java
deleted file mode 100644
index 3826498..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/AddWSDLToWSILWrapperCommand.java
+++ /dev/null
@@ -1,61 +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.consumption.ui.wsil;
-
-import org.eclipse.wst.ws.internal.wsil.AddWSDLToWSILCommand;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-
-
-
-public class AddWSDLToWSILWrapperCommand extends SimpleCommand
-{
-  private AddWSDLToWSILCommand command;
-  private Arguments args;
-
-  public AddWSDLToWSILWrapperCommand()
-  {
-    super("org.eclipse.jst.ws.internal.consumption.ui.wsil.AddWSDLToWSILWrapperCommand", "org.eclipse.jst.ws.internal.consumption.ui.wsil.AddWSDLToWSILWrapperCommand");
-  }
-
-  public Status execute(Environment env)
-  {
-    if (command == null)
-      command = new AddWSDLToWSILCommand();
-    if (!args.isEmpty())
-    {
-      command.setArguments(args.getStringArguments());
-      command.setWWWAuthenticationHandler(new DialogWWWAuthentication(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell()));
-      return command.execute(env);
-    }
-    return new SimpleStatus("");
-  }
-  /**
-   * @param args The args to set.
-   */
-  public void setArgs(Arguments args)
-  {
-    this.args = args;
-  }
-
-  /**
-   * @param command The command to set.
-   */
-  public void setCommand(AddWSDLToWSILCommand command)
-  {
-    this.command = command;
-  }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/Arguments.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/Arguments.java
deleted file mode 100644
index 7a177c5..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/Arguments.java
+++ /dev/null
@@ -1,75 +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.consumption.ui.wsil;
-
-import java.util.Vector;
-
-public class Arguments
-{
-  private Vector args_;
-
-  public Arguments()
-  {
-    args_ = new Vector();
-  }
-
-  public void add(String key, Object value)
-  {
-    args_.add(key);
-    if (value != null)
-      args_.add(value);
-  }
-
-  public void remove(String key)
-  {
-    int index = args_.indexOf(key);
-    if (index >= 0)
-    {
-      args_.remove(index);
-      args_.remove(index+1);
-    }
-  }
-
-  public Object get(String key)
-  {
-    int index = args_.indexOf(key);
-    if (index >= 0)
-      return args_.get(index+1);
-    else
-      return null;
-  }
-
-  public void clear()
-  {
-    args_.clear();
-  }
-
-  public Object[] getArguments()
-  {
-    Object[] args = new Object[args_.size()];
-    args_.copyInto(args);
-    return args;
-  }
-
-  public String[] getStringArguments()
-  {
-    String[] args = new String[args_.size()];
-    for (int i = 0; i < args.length; i++)
-      args[i] = args_.get(i).toString();
-    return args;
-  }
-
-  public boolean isEmpty()
-  {
-    return args_.isEmpty();
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/DialogWWWAuthentication.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/DialogWWWAuthentication.java
deleted file mode 100644
index be61e21..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/DialogWWWAuthentication.java
+++ /dev/null
@@ -1,157 +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.consumption.ui.wsil;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-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.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.ws.parser.wsil.WWWAuthenticationException;
-import org.eclipse.wst.ws.parser.wsil.WWWAuthenticationHandler;
-
-
-public class DialogWWWAuthentication extends Dialog implements WWWAuthenticationHandler
-{
-
-  /*CONTEXT_ID DBAS0001 for the HTTP basic authentication user name*/
-  private final String INFOPOP_DBAS_USERNAME = WebServiceConsumptionUIPlugin.ID + ".DBAS0001";
-
-  /*CONTEXT_ID DBAS0002 for the HTTP basic authentication password*/
-  private final String INFOPOP_DBAS_PASSWORD = WebServiceConsumptionUIPlugin.ID + ".DBAS0002";
-
-  private String usernameString_;
-  private String passwordString_;
-
-  private Text username_;
-  private Text password_;
-
-  private WWWAuthenticationException wwwae_;
-
-  public DialogWWWAuthentication(Shell shell)
-  {
-    super(shell);
-    usernameString_ = null;
-    passwordString_ = null;
-    wwwae_ = null;
-  }
-
-  /**
-  * Called when the Cancel button is pressed.
-  */
-  protected void cancelPressed()
-  {
-    usernameString_ = null;
-    passwordString_ = null;
-    super.cancelPressed();
-  }
-
-  /**
-  * Called when the OK button is pressed.
-  */
-  protected void okPressed()
-  {
-    String usernameString = username_.getText();
-    usernameString_ = (usernameString.length() > 0) ? usernameString : null;
-    String passwordString = password_.getText();
-    passwordString_ = (passwordString.length() > 0) ? passwordString : null;
-    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_HTTP_BASIC_AUTH"));
-  }
-
-  /** 
-  * 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.grabExcessVerticalSpace = true;
-    gd.grabExcessHorizontalSpace = true;
-    composite.setLayoutData(gd);
-    GridLayout gl = new GridLayout();
-    gl.numColumns = 2;
-    gl.verticalSpacing = 15;
-    composite.setLayout(gl);
-
-    Label label = new Label(composite, SWT.WRAP);
-    label.setText(getMessage("%LABEL_URL"));
-    label.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-
-    label = new Label(composite, SWT.WRAP);
-    label.setText(wwwae_.getURL());
-    label.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-    label = new Label(composite, SWT.WRAP);
-    label.setText(getMessage("%LABEL_HTTP_BASIC_AUTH_USERNAME"));
-    label.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-
-    username_ = new Text(composite, SWT.BORDER);
-    username_.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-    username_.setToolTipText(getMessage("%TOOLTIP_HTTP_BASIC_AUTH_USERNAME"));
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(username_, INFOPOP_DBAS_USERNAME);
-
-    label = new Label(composite, SWT.WRAP);
-    label.setText(getMessage("%LABEL_HTTP_BASIC_AUTH_PASSWORD"));
-    label.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-
-    password_ = new Text(composite, SWT.BORDER);
-    password_.setEchoChar('*');
-    password_.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-    password_.setToolTipText(getMessage("%TOOLTIP_HTTP_BASIC_AUTH_PASSWORD"));
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(username_, INFOPOP_DBAS_PASSWORD);
-
-    return composite;
-  }
-
-  private String getMessage(String msgId)
-  {
-    return WebServiceConsumptionUIPlugin.getMessage(msgId);
-  }
-
-  public void handleWWWAuthentication(WWWAuthenticationException wwwae)
-  {
-    usernameString_ = null;
-    passwordString_ = null;
-    wwwae_ = wwwae;
-    open();
-  }
-
-  public String getUsername()
-  {
-    return usernameString_;
-  }
-
-  public String getPassword()
-  {
-    return passwordString_;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/TableViewerEditor.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/TableViewerEditor.java
deleted file mode 100644
index aa98c14..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/TableViewerEditor.java
+++ /dev/null
@@ -1,525 +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.consumption.ui.wsil;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.TableEditor;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.KeyListener;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.MouseListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.events.TraverseEvent;
-import org.eclipse.swt.events.TraverseListener;
-import org.eclipse.swt.graphics.Image;
-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.Composite;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-
-
-public class TableViewerEditor extends Composite
-{
-  private int DEFAULT_TABLE_HEIGHT_HINT = 100;
-  private int DEFAULT_COLUMN_WIDTH = 80;
-
-  private String[] columns_;
-  private TableViewer tableViewer_;
-  private Table table_;
-  private TableEditor editor_;
-  private TableEditorListener tableEditorListener_;
-  private Text text_;
-  private Button add_;
-  private Button remove_;
-
-  private List values_;
-  private Object defaultValue_;
-
-  public TableViewerEditor(Composite parent, String[] columns, List initValues, Object defaultValue)
-  {
-    super(parent, SWT.NONE);
-    columns_ = columns;
-    values_ = new ArrayList();
-    if (initValues != null && initValues.size() > 0)
-      values_.addAll(initValues);
-    defaultValue_ = (defaultValue != null) ? defaultValue : new String("");
-    createPartControl(this);
-  }
-
-  private void createPartControl(Composite parent)
-  {
-    GridLayout gl = new GridLayout();
-    gl.marginHeight = 0;
-    gl.marginWidth = 0;
-    setLayout(gl);
-    setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-    Composite composite = new Composite(parent, SWT.NONE);
-    gl = new GridLayout();
-    gl.marginHeight = 0;
-    gl.marginWidth = 0;
-    composite.setLayout(gl);
-    composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-    table_ = new Table(composite, SWT.SINGLE | SWT.FULL_SELECTION | SWT.BORDER);
-    GridData gd = new GridData(GridData.FILL_BOTH);
-    gd.heightHint = DEFAULT_TABLE_HEIGHT_HINT;
-    table_.setLayoutData(gd);
-    table_.setHeaderVisible(true);
-    table_.setLinesVisible(true);
-    TableLayout tableLayout = new TableLayout();
-    int maxWidth = DEFAULT_COLUMN_WIDTH;
-    for (int i = 0; i < columns_.length; i++)
-    {
-      TableColumn tableColumn = new TableColumn(table_, SWT.NONE);
-      tableColumn.setText(columns_[i]);
-      tableColumn.pack();
-      int tableColumnWidth = Math.max(DEFAULT_COLUMN_WIDTH, tableColumn.getWidth());
-      maxWidth = Math.max(maxWidth, tableColumnWidth);
-      ColumnWeightData columnData = new ColumnWeightData(tableColumnWidth, tableColumnWidth, true);
-      tableLayout.addColumnData(columnData);
-    }
-    table_.setLayout(tableLayout);
-    // initialize the table editor
-    editor_ = new TableEditor(table_);
-    // The editor must have the same size as the cell and must
-    // not be any smaller than 50 pixels.
-    editor_.horizontalAlignment = SWT.LEFT;
-    editor_.grabHorizontal = true;
-    editor_.minimumWidth = maxWidth;
-    tableEditorListener_ = new TableEditorListener();
-    table_.addMouseListener(tableEditorListener_);
-    tableViewer_ = new TableViewer(table_);
-    tableViewer_.getControl().addKeyListener(
-      new KeyListener()
-      {
-        public void keyPressed(KeyEvent e)
-        {
-          // Del
-          if (((int)e.character) == 127) 
-            handleDeleteKeyPressed();
-          // Enter or space
-          if (((int)e.character) == 13 || ((int)e.character) == 32)
-            tableEditorListener_.editSelection();
-        }
-        public void keyReleased(KeyEvent e)
-        {
-        }
-      }
-    );
-    tableViewer_.setContentProvider(new ListContentProvider());
-    tableViewer_.setLabelProvider(new ListLabelProvider());
-    tableViewer_.setInput(values_);
-    tableViewer_.addSelectionChangedListener(
-      new ISelectionChangedListener()
-      {
-        public void selectionChanged(SelectionChangedEvent event)
-        {
-          enableRemove(true);
-        }
-      }
-    );
-
-    Composite buttonComposite = new Composite(composite, SWT.NONE);
-    gl = new GridLayout();
-    gl.numColumns = 2;
-    gl.makeColumnsEqualWidth = true;
-    buttonComposite.setLayout(gl);
-    buttonComposite.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_BEGINNING));
-
-    add_ = new Button(buttonComposite, SWT.PUSH);
-    add_.setText(WebServiceConsumptionUIPlugin.getMessage("%LABEL_ADD"));
-    add_.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-    add_.addSelectionListener(
-      new SelectionListener()
-      {
-        public void widgetSelected(SelectionEvent event)
-        {
-          handleAddButtonSelected(event);
-        }
-        public void widgetDefaultSelected(SelectionEvent event)
-        {
-        }
-      }
-    );
-
-    remove_ = new Button(buttonComposite, SWT.PUSH);
-    remove_.setText(WebServiceConsumptionUIPlugin.getMessage("%LABEL_REMOVE"));
-    remove_.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-    remove_.addSelectionListener(
-      new SelectionListener()
-      {
-        public void widgetSelected(SelectionEvent event)
-        {
-          handleRemoveButtonSelected(event);
-        }
-        public void widgetDefaultSelected(SelectionEvent event)
-        {
-        }
-      }
-    );
-    enableRemove(false);
-  }
-
-  private void enableRemove(boolean enabled)
-  {
-    remove_.setEnabled(enabled && !tableViewer_.getSelection().isEmpty());
-  }
-
-  private void handleAddButtonSelected(SelectionEvent event)
-  {
-    values_.add(defaultValue_);
-    refresh();
-    setSelectionAsObject(values_.get(table_.getItemCount()-1));
-    tableEditorListener_.editSelection();
-  }
-
-  private void handleRemoveButtonSelected(SelectionEvent event)
-  {
-    handleDeleteKeyPressed();
-  }
-
-  private void handleDeleteKeyPressed()
-  {
-    internalDispose();
-    ISelection selection = tableViewer_.getSelection();
-    if (selection != null && !selection.isEmpty() && (selection instanceof IStructuredSelection))
-    {
-      int selectionIndex = table_.getSelectionIndex();
-      int selectionCount = table_.getItemCount();
-      values_.remove(selectionIndex);
-      if (selectionIndex < selectionCount-1)
-        setSelectionAsObject(values_.get(selectionIndex));
-      else if (selectionCount -2 >= 0)
-        setSelectionAsObject(values_.get(selectionCount-2));
-      refresh();
-    }
-  }
-
-  private void internalRefresh()
-  {
-    // synchronize text field, previously selected table cell and model (inputObject)
-    if (text_ != null)
-    {
-      TableItem oldTableItem = editor_.getItem();
-      int oldColumnIndex = editor_.getColumn();
-      if (oldTableItem != null && oldColumnIndex >= 0 && oldColumnIndex < columns_.length)
-      {
-        String oldText = text_.getText();
-        oldTableItem.setText(oldColumnIndex, oldText);
-        int oldRowIndex = table_.indexOf(oldTableItem);
-        values_.set(oldRowIndex, oldText);
-      }
-    }
-  }
-
-  private void setSelectionAsObject(Object object)
-  {
-    tableViewer_.setSelection(new StructuredSelection(object), true);
-  }
-
-  public void setToolTipText(String string)
-  {
-    table_.setToolTipText(string);
-  }
-
-  public void setInfopop(String string)
-  {
-  	PlatformUI.getWorkbench().getHelpSystem().setHelp(table_, string);
-  }
-  
-  public void setInput(List list)
-  {
-    values_.clear();
-    values_.addAll(list);
-  }
-
-  public void refresh()
-  {
-    internalRefresh();
-    tableViewer_.refresh();
-  }
-
-  public TableItem[] getItems()
-  {
-    internalRefresh();
-    return table_.getItems();
-  }
-
-  public void setEnabled(boolean enabled)
-  {
-    super.setEnabled(enabled);
-    add_.setEnabled(enabled);
-    enableRemove(enabled);
-  }
-
-  public void dispose()
-  {
-    super.dispose();
-    internalDispose();
-    if (editor_ != null)
-      editor_.dispose();
-    if (table_ != null)
-      table_.dispose();
-    if (add_ != null)
-      add_.dispose();
-    if (remove_ != null)
-      remove_.dispose();
-  }
-
-  private void internalDispose()
-  {
-    if (text_ != null)
-      text_.dispose();
-    text_ = null;
-  }
-
-  protected class TableEditorListener implements MouseListener
-  {
-    private int currSelectionIndex_;
-    private int editRow_;
-    private int editColumn_;
-
-    public TableEditorListener()
-    {
-      super();
-      currSelectionIndex_ = -1;
-      editRow_ = -1;
-      editColumn_ = -1;
-    }
-
-    public void mouseDoubleClick(MouseEvent e)
-    {
-      mouseDown(e);
-    }
-
-    public void mouseDown(MouseEvent e)
-    {
-      // refresh table
-      internalRefresh();
-      // Clean up previous text editor control
-      internalDispose();
-      // update table
-      if (table_.isFocusControl())
-      {
-        int selectedRowIndex = getSelectedRow(table_, e.y);
-        if (currSelectionIndex_ != -1 && selectedRowIndex != -1 && currSelectionIndex_ == selectedRowIndex)
-        {
-          TableItem tableItem = table_.getItem(selectedRowIndex);
-          int selectedColumnIndex = getSelectedColumn(tableItem, e.x, e.y);
-          if (selectedColumnIndex != -1 && (text_ == null || text_.isDisposed() || selectedColumnIndex != editor_.getColumn()))
-            editSelection(selectedRowIndex, selectedColumnIndex);
-        }
-        currSelectionIndex_ = selectedRowIndex;
-      }
-    }
-
-    public void mouseUp(MouseEvent e)
-    {
-    }
-
-    private int getSelectedRow(Table table, int y)
-    {
-      TableItem[] tableItems = table.getItems();
-      for (int i = 0; i < tableItems.length; i++)
-      {
-        Rectangle rectangle = tableItems[i].getBounds(0);
-        if (rectangle != null && y >= rectangle.y && y < (rectangle.y + rectangle.height))
-          return i;
-      }
-      return -1;
-    }
-
-    private int getSelectedColumn(TableItem tableItem, int x, int y)
-    {
-      for (int i = 0; i < columns_.length; i++)
-      {
-        if (tableItem.getBounds(i).contains(x, y))
-          return i;
-      }
-      return -1;
-    }
-
-    private void editSelection(int row, int column)
-    {
-      editRow_ = row;
-      editColumn_ = column;
-      TableItem tableItem = table_.getItem(row);
-      // Setup adapter for the new selection
-      text_ = new Text(table_, SWT.NONE);
-      String text = tableItem.getText(column);
-      text_.setText((text != null) ? text : "");
-      text_.addKeyListener(new KeyListener()
-        {
-          public void keyPressed(KeyEvent e)
-          {
-            // Esc
-            if (((int)e.character) == 27)
-              cancelSelection();
-          }
-          public void keyReleased(KeyEvent e)
-          {
-          }
-        }
-      );
-      text_.addTraverseListener(new TraverseListener()
-        {
-          public void keyTraversed(TraverseEvent e)
-          {
-            if (e.detail == SWT.TRAVERSE_TAB_NEXT)
-              traverseTabNext();
-            else if (e.detail == SWT.TRAVERSE_TAB_PREVIOUS)
-              traverseTabPrevious();
-          }
-        }
-      );
-      editor_.setEditor(text_, tableItem, column);
-      text_.setFocus();
-      text_.selectAll();
-    }
-
-    protected void traverseTabNext()
-    {
-      internalRefresh();
-      internalDispose();
-      if (!(editRow_ == table_.getItems().length-1 && editColumn_ == columns_.length-1))
-      {
-        if (editColumn_ < columns_.length-1)
-          editColumn_++;
-        else
-        {
-          editColumn_ = 0;
-          editRow_++;
-          table_.select(editRow_);
-        }
-        editSelection(editRow_, editColumn_);
-      }
-    }
-
-    protected void traverseTabPrevious()
-    {
-      internalRefresh();
-      internalDispose();
-      if (!(editRow_ == 0 && editColumn_ == 0))
-      {
-        if (editColumn_ > 0)
-          editColumn_--;
-        else
-        {
-          editColumn_ = columns_.length-1;
-          editRow_--;
-          table_.select(editRow_);
-        }
-        editSelection(editRow_, editColumn_);
-      }
-    }
-
-    public void cancelSelection()
-    {
-      internalDispose();
-      internalRefresh();
-    }
-
-    public void editSelection()
-    {
-      int selectedRowIndex = table_.getSelectionIndex();
-      if (selectedRowIndex != -1 && columns_.length > 0)
-      {
-        // refresh table
-        internalRefresh();
-        // Clean up any previous editor control
-        internalDispose();
-        editSelection(selectedRowIndex, 0);
-      }
-      currSelectionIndex_ = selectedRowIndex;
-    }
-  }
-
-  protected class ListContentProvider implements IStructuredContentProvider
-  {
-    public void dispose()
-    {
-    }
-
-    public void inputChanged(Viewer viewer, Object oldInput, Object newInput)
-    {
-      tableViewer_.add(getElements(newInput));
-    }
-
-    public Object[] getElements(Object inputElement)
-    {
-      if (inputElement instanceof List)
-      {
-        List list = (List)inputElement;
-        Object[] objects = new Object[list.size()];
-        for (int i = 0; i < objects.length; i++)
-          objects[i] = list.get(i);
-        return objects;
-      }
-      else
-        return new Object[0];
-    }
-  }
-
-  protected class ListLabelProvider implements ITableLabelProvider
-  {
-    public Image getColumnImage(Object element, int columnIndex)
-    {
-      return null;
-    }
-
-    public String getColumnText(Object element, int columnIndex)
-    {
-      return element.toString();
-    }
-
-    public void addListener(ILabelProviderListener listener)
-    {
-    }
-
-    public void removeListener(ILabelProviderListener listener)
-    {
-    }
-
-    public boolean isLabelProperty(Object element, String property)
-    {
-      return true;
-    }
-
-    public void dispose()
-    {
-    }
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/Utils.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/Utils.java
deleted file mode 100644
index 41e17c3..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/Utils.java
+++ /dev/null
@@ -1,53 +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.consumption.ui.wsil;
-
-import java.net.MalformedURLException;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-
-
-public class Utils
-{
-  public Utils()
-  {
-  }
-
-  public String toFileSystemURI(String relativePlatformURI)
-  {
-    if (relativePlatformURI != null)
-      return toFileSystemURI(ResourceUtils.findResource(relativePlatformURI));
-    else
-      return null;
-  }
-
-  public String toFileSystemURI(IResource res)
-  {
-    if (res != null)
-    {
-      IPath path = res.getLocation();
-      if (path != null)
-      {
-        try
-        {
-          return path.toFile().toURL().toString();
-        }
-        catch (MalformedURLException murle)
-        {
-        }
-      }
-    }
-    return null;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/dummy/DummyWebService.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/dummy/DummyWebService.java
deleted file mode 100644
index 444983d..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/dummy/DummyWebService.java
+++ /dev/null
@@ -1,158 +0,0 @@
-package org.eclipse.jst.ws.internal.dummy;
-
-import java.util.Vector;
-
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.command.internal.provisional.ICommandFactory;
-import org.eclipse.wst.command.internal.provisional.SimpleCommandFactory;
-import org.eclipse.wst.ws.internal.provisional.wsrt.AbstractWebService;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IContext;
-import org.eclipse.wst.ws.internal.provisional.wsrt.ISelection;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebService;
-import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceInfo;
-
-public class DummyWebService extends AbstractWebService
-{
-	
-
-	public DummyWebService(WebServiceInfo info)
-	{
-		super(info);
-	}
-
-	public ICommandFactory assemble(Environment env, IContext ctx,
-			ISelection sel, String module, String ear)
-	{
-		Vector commands = new Vector();
-		commands.add(new TestCommand3(this));
-		return new SimpleCommandFactory(commands);
-	}
-
-	public ICommandFactory deploy(Environment env, IContext ctx, ISelection sel,
-			String module, String ear)
-	{
-		Vector commands = new Vector();
-		commands.add(new TestCommand4(this));
-		return new SimpleCommandFactory(commands);
-	}
-
-	public ICommandFactory develop(Environment env, IContext ctx, ISelection sel,
-			String module, String ear)
-	{
-		Vector commands = new Vector();
-		commands.add(new TestCommand1(this));
-		commands.add(new TestCommand2(this));
-		return new SimpleCommandFactory(commands);
-	}
-
-	public ICommandFactory install(Environment env, IContext ctx, ISelection sel,
-			String module, String ear)
-	{
-		Vector commands = new Vector();
-		commands.add(new TestCommand5(this));
-		return new SimpleCommandFactory(commands);
-	}
-
-	public ICommandFactory run(Environment env, IContext ctx, ISelection sel,
-			String module, String ear)
-	{
-		Vector commands = new Vector();
-		commands.add(new TestCommand6(this));
-		return new SimpleCommandFactory(commands);
-	}
-	
- private class TestCommand1 extends SimpleCommand
-	{
-	 IWebService ws;
-	 public TestCommand1(IWebService ws)
-	 {
-		 this.ws=ws;
-	 }
-	 public Status execute(Environment env)
-	 {
-		System.out.println("In develop command 1");
-		ws.getWebServiceInfo().setWsdlURL("http://someWSDLURL");
-		return super.execute(env);
-	 }
-	}
-
-	private class TestCommand2 extends SimpleCommand
-	{
-		 IWebService ws;
-		 public TestCommand2(IWebService ws)
-		 {
-			 this.ws=ws;
-		 }
-		 
-		public Status execute(Environment env)
-		{
-			System.out.println("In develop command 2");
-			ws.getWebServiceInfo().setImplURL("file://someImplURL");
-			return super.execute(env);
-		}
-	}
-	
-	private class TestCommand3 extends SimpleCommand
-	{
-		 IWebService ws;
-		 public TestCommand3(IWebService ws)
-		 {
-			 this.ws=ws;
-		 }
-		 
-		public Status execute(Environment env)
-		{
-			System.out.println("In assemble command");
-			return super.execute(env);
-		}
-	}
-	
-	private class TestCommand4 extends SimpleCommand
-	{
-		 IWebService ws;
-		 public TestCommand4(IWebService ws)
-		 {
-			 this.ws=ws;
-		 }
-		 
-		public Status execute(Environment env)
-		{
-			System.out.println("In deploy command");
-			ws.getWebServiceInfo().setEndPointURL("http://someEndpointURL");
-			return super.execute(env);
-		}
-	}
-	
-	private class TestCommand5 extends SimpleCommand
-	{
-		 IWebService ws;
-		 public TestCommand5(IWebService ws)
-		 {
-			 this.ws=ws;
-		 }
-		 
-		public Status execute(Environment env)
-		{
-			System.out.println("In install command");
-			return super.execute(env);
-		}
-	}	
-	
-	private class TestCommand6 extends SimpleCommand
-	{
-		 IWebService ws;
-		 public TestCommand6(IWebService ws)
-		 {
-			 this.ws=ws;
-		 }
-		 
-		public Status execute(Environment env)
-		{
-			System.out.println("In run command");
-			return super.execute(env);
-		}
-	}	
-}	
-
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/dummy/DummyWebServiceClient.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/dummy/DummyWebServiceClient.java
deleted file mode 100644
index abfcd80..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/dummy/DummyWebServiceClient.java
+++ /dev/null
@@ -1,154 +0,0 @@
-package org.eclipse.jst.ws.internal.dummy;
-
-import java.util.Vector;
-
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.command.internal.provisional.ICommandFactory;
-import org.eclipse.wst.command.internal.provisional.SimpleCommandFactory;
-import org.eclipse.wst.ws.internal.provisional.wsrt.AbstractWebServiceClient;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IContext;
-import org.eclipse.wst.ws.internal.provisional.wsrt.ISelection;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceClient;
-import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceClientInfo;
-
-public class DummyWebServiceClient extends AbstractWebServiceClient
-{		
-
-	public DummyWebServiceClient(WebServiceClientInfo info)
-	{
-		super(info);
-		// TODO Auto-generated constructor stub
-	}
-
-	public ICommandFactory assemble(Environment env, IContext ctx,
-			ISelection sel, String module, String ear)
-	{
-		Vector commands = new Vector();
-		commands.add(new TestCommand3(this));
-		return new SimpleCommandFactory(commands);
-	}
-
-	public ICommandFactory deploy(Environment env, IContext ctx, ISelection sel,
-			String module, String ear)
-	{
-		Vector commands = new Vector();
-		commands.add(new TestCommand4(this));
-		return new SimpleCommandFactory(commands);
-	}
-
-	public ICommandFactory develop(Environment env, IContext ctx, ISelection sel,
-			String module, String ear)
-	{
-		Vector commands = new Vector();
-		commands.add(new TestCommand1(this));
-		commands.add(new TestCommand2(this));
-		return new SimpleCommandFactory(commands);
-	}
-
-	public ICommandFactory install(Environment env, IContext ctx, ISelection sel,
-			String module, String ear)
-	{
-		Vector commands = new Vector();
-		commands.add(new TestCommand5(this));
-		return new SimpleCommandFactory(commands);
-	}
-
-	public ICommandFactory run(Environment env, IContext ctx, ISelection sel,
-			String module, String ear)
-	{
-		Vector commands = new Vector();
-		commands.add(new TestCommand6(this));
-		return new SimpleCommandFactory(commands);
-	}
-
-	 private class TestCommand1 extends SimpleCommand
-		{
-		 IWebServiceClient ws;
-		 public TestCommand1(IWebServiceClient ws)
-		 {
-			 this.ws=ws;
-		 }
-		 public Status execute(Environment env)
-		 {
-			System.out.println("In client develop command 1");
-			return super.execute(env);
-		 }
-		}
-
-		private class TestCommand2 extends SimpleCommand
-		{
-			 IWebServiceClient ws;
-			 public TestCommand2(IWebServiceClient ws)
-			 {
-				 this.ws=ws;
-			 }
-			 
-			public Status execute(Environment env)
-			{
-				System.out.println("In client develop command 2");
-				return super.execute(env);
-			}
-		}
-		
-		private class TestCommand3 extends SimpleCommand
-		{
-			 IWebServiceClient ws;
-			 public TestCommand3(IWebServiceClient ws)
-			 {
-				 this.ws=ws;
-			 }
-			 
-			public Status execute(Environment env)
-			{
-				System.out.println("In client assemble command");
-				return super.execute(env);
-			}
-		}
-		
-		private class TestCommand4 extends SimpleCommand
-		{
-			 IWebServiceClient ws;
-			 public TestCommand4(IWebServiceClient ws)
-			 {
-				 this.ws=ws;
-			 }
-			 
-			public Status execute(Environment env)
-			{
-				System.out.println("In client deploy command");
-				return super.execute(env);
-			}
-		}
-		
-		private class TestCommand5 extends SimpleCommand
-		{
-			 IWebServiceClient ws;
-			 public TestCommand5(IWebServiceClient ws)
-			 {
-				 this.ws=ws;
-			 }
-			 
-			public Status execute(Environment env)
-			{
-				System.out.println("In client install command");
-				return super.execute(env);
-			}
-		}	
-		
-		private class TestCommand6 extends SimpleCommand
-		{
-			 IWebServiceClient ws;
-			 public TestCommand6(IWebServiceClient ws)
-			 {
-				 this.ws=ws;
-			 }
-			 
-			public Status execute(Environment env)
-			{
-				System.out.println("In client run command");
-				return super.execute(env);
-			}
-		}		
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/dummy/DummyWebServiceRuntime.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/dummy/DummyWebServiceRuntime.java
deleted file mode 100644
index 70732fc..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/dummy/DummyWebServiceRuntime.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.eclipse.jst.ws.internal.dummy;
-
-import org.eclipse.wst.ws.internal.provisional.wsrt.AbstractWebServiceRuntime;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebService;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceClient;
-import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceClientInfo;
-import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceInfo;
-
-public class DummyWebServiceRuntime extends AbstractWebServiceRuntime
-{
-
-	public IWebService getWebService(WebServiceInfo info)
-	{
-    return new DummyWebService(info);
-	}
-
-	public IWebServiceClient getWebServiceClient(WebServiceClientInfo info)
-	{
-		return new DummyWebServiceClient(info);
-	}
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/dummy/DummyWidgetFactory.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/dummy/DummyWidgetFactory.java
deleted file mode 100644
index 90506d0..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/dummy/DummyWidgetFactory.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package org.eclipse.jst.ws.internal.dummy;
-
-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.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.command.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.env.ui.widgets.WidgetContributorFactory;
-import org.eclipse.wst.command.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.command.internal.provisional.ui.widgets.INamedWidgetContributor;
-import org.eclipse.wst.command.internal.provisional.ui.widgets.INamedWidgetContributorFactory;
-import org.eclipse.wst.command.internal.provisional.ui.widgets.SimpleWidgetContributor;
-
-public class DummyWidgetFactory implements INamedWidgetContributorFactory {
-
-    private Button checkBox_;
-	private SimpleWidgetContributor widget1_;
-	private SimpleWidgetContributor widget2_;
-	
-	public DummyWidgetFactory()
-	{
-		widget1_ = new SimpleWidgetContributor();		
-		widget1_.setDescription( "Extentions desc 1" );
-		widget1_.setTitle( "Extention title 1" );
-		widget1_.setName( "Extension name 1" );
-		widget1_.setFactory( getContributor1() );
-		
-	    widget2_ = new SimpleWidgetContributor();
-		widget2_.setDescription( "Extentions desc 2" );
-		widget2_.setTitle( "Extention title 2" );
-		widget2_.setName( "Extension name 2" );
-		widget2_.setFactory( getContributor2() );
-	}
-	
-	public INamedWidgetContributor getFirstNamedWidget() 
-	{
-	  return widget1_;
-	}
-
-	public INamedWidgetContributor getNextNamedWidget( INamedWidgetContributor widgetContributor) 
-	{
-	  return widgetContributor == widget1_ && checkBox_.getSelection() ? widget2_ : null;
-	}
-	
-	private WidgetContributorFactory getContributor1()
-	{
-	  return new WidgetContributorFactory()
-	  {
-
-		public WidgetContributor create()
-		{
-		  return new SimpleWidgetDataContributor()
-		  {
-		    public WidgetDataEvents addControls(Composite parent, final Listener statusListener) 
-		    {
-			  checkBox_ = new Button( parent, SWT.CHECK );
-			  checkBox_.setText( "Display next page?" );
-			  checkBox_.addSelectionListener( new SelectionAdapter()
-					                          {
-												public void widgetSelected(SelectionEvent e) 
-												{
-												  statusListener.handleEvent( null );
-												}
-					                          });
-			  
-			  return this;
-		    }
-
-		    public Status getStatus() 
-		    {
-			  return new SimpleStatus("");
-		    }
-		  };
-		}  
-	  };
-	}
-	
-	private WidgetContributorFactory getContributor2()
-	{
-	  return new WidgetContributorFactory()
-	  {
-
-		public WidgetContributor create()
-		{
-		  return new SimpleWidgetDataContributor()
-		  {
-		    public WidgetDataEvents addControls(Composite parent, final Listener statusListener) 
-		    {
-              Label label = new Label( parent, SWT.NONE );
-			  label.setText( "Optional second page" );
-			  
-			  return this;
-		    }
-
-		    public Status getStatus() 
-		    {
-			  return new SimpleStatus("");
-		    }
-		  };
-		}  
-	  };
-	}
-
-	public void registerDataMappings(DataMappingRegistry dataRegistry) {
-		// TODO Auto-generated method stub
-		
-	}
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/dummy/DummyWidgetFactory2.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/dummy/DummyWidgetFactory2.java
deleted file mode 100644
index b7ed274..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/dummy/DummyWidgetFactory2.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package org.eclipse.jst.ws.internal.dummy;
-
-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.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.command.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.env.ui.widgets.WidgetContributorFactory;
-import org.eclipse.wst.command.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.command.internal.provisional.ui.widgets.INamedWidgetContributor;
-import org.eclipse.wst.command.internal.provisional.ui.widgets.INamedWidgetContributorFactory;
-import org.eclipse.wst.command.internal.provisional.ui.widgets.SimpleWidgetContributor;
-
-public class DummyWidgetFactory2 implements INamedWidgetContributorFactory {
-
-    private Button checkBox_;
-	private SimpleWidgetContributor widget1_;
-	private SimpleWidgetContributor widget2_;
-	
-	public DummyWidgetFactory2()
-	{
-		widget1_ = new SimpleWidgetContributor();		
-		widget1_.setDescription( "Extentions Second round desc 1" );
-		widget1_.setTitle( "Extention Second round title 1" );
-		widget1_.setName( "Extension name 1" );
-		widget1_.setFactory( getContributor1() );
-		
-	    widget2_ = new SimpleWidgetContributor();
-		widget2_.setDescription( "Extentions Second round desc 2" );
-		widget2_.setTitle( "Extention Second round  title 2" );
-		widget2_.setName( "Extension name 2" );
-		widget2_.setFactory( getContributor2() );
-	}
-	
-	public INamedWidgetContributor getFirstNamedWidget() 
-	{
-	  return widget1_;
-	}
-
-	public INamedWidgetContributor getNextNamedWidget( INamedWidgetContributor widgetContributor) 
-	{
-	  return widgetContributor == widget1_ && checkBox_.getSelection() ? widget2_ : null;
-	}
-	
-	private WidgetContributorFactory getContributor1()
-	{
-	  return new WidgetContributorFactory()
-	  {
-
-		public WidgetContributor create()
-		{
-		  return new SimpleWidgetDataContributor()
-		  {
-		    public WidgetDataEvents addControls(Composite parent, final Listener statusListener) 
-		    {
-			  checkBox_ = new Button( parent, SWT.CHECK );
-			  checkBox_.setText( "Display next page again?" );
-			  checkBox_.addSelectionListener( new SelectionAdapter()
-					                          {
-												public void widgetSelected(SelectionEvent e) 
-												{
-												  statusListener.handleEvent( null );
-												}
-					                          });
-			  
-			  return this;
-		    }
-
-		    public Status getStatus() 
-		    {
-			  return new SimpleStatus("");
-		    }
-		  };
-		}  
-	  };
-	}
-	
-	private WidgetContributorFactory getContributor2()
-	{
-	  return new WidgetContributorFactory()
-	  {
-
-		public WidgetContributor create()
-		{
-		  return new SimpleWidgetDataContributor()
-		  {
-		    public WidgetDataEvents addControls(Composite parent, final Listener statusListener) 
-		    {
-              Label label = new Label( parent, SWT.NONE );
-			  label.setText( "Optional second round 2 page" );
-			  
-			  return this;
-		    }
-
-		    public Status getStatus() 
-		    {
-			  return new SimpleStatus("");
-		    }
-		  };
-		}  
-	  };
-	}
-
-	public void registerDataMappings(DataMappingRegistry dataRegistry) {
-		// TODO Auto-generated method stub
-		
-	}
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/wsrt/ClientType.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/wsrt/ClientType.java
deleted file mode 100644
index bdc7343..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/wsrt/ClientType.java
+++ /dev/null
@@ -1,119 +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.wsrt;
-
-import java.util.Hashtable;
-import java.util.StringTokenizer;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-
-public class ClientType {
-
-  private IConfigurationElement elem_;
-  private Hashtable webServiceClientImpls_;
-    
-	private String id;
-	private WebServiceClientImpl webServiceClientImpl;
-	private String[] moduleTypesInclude;
-  private String[] moduleTypesExclude;
-  private String webServiceClientTypeId;
-	
-  
-  
-	public ClientType(IConfigurationElement elem_, Hashtable webServiceClientImpls_)
-  {
-    super();
-    this.elem_ = elem_;
-    this.webServiceClientImpls_ = webServiceClientImpls_;
-  }
-
-
-
-  public String getId()
-  {
-    if (id==null)
-    {
-      id = elem_.getAttribute("id");
-    }
-    return id;
-  }
-  
-
-
-
-  public String[] getModuleTypesExclude()
-  {
-    if (moduleTypesExclude==null)
-    {
-      String attr = elem_.getAttribute("moduleTypesExclude");
-      if (attr != null && attr.length()>0)
-      {
-        StringTokenizer st = new StringTokenizer(attr, " ");
-        int size = st.countTokens();
-        moduleTypesExclude = new String[size];
-        for (int i = 0; i < moduleTypesExclude.length; i++)
-          moduleTypesExclude[i] = st.nextToken();
-      }
-    }
-    return moduleTypesExclude;
-  }
-  
-
-
-
-  public String[] getModuleTypesInclude()
-  {
-    if (moduleTypesInclude==null)
-    {
-      String attr = elem_.getAttribute("moduleTypesInclude");
-      if (attr != null && attr.length()>0)
-      {
-        StringTokenizer st = new StringTokenizer(attr, " ");
-        int size = st.countTokens();
-        moduleTypesInclude = new String[size];
-        for (int i = 0; i < moduleTypesInclude.length; i++)
-          moduleTypesInclude[i] = st.nextToken();
-      }
-    }
-    return moduleTypesInclude;
-  }
-  
-
-
-
-  public WebServiceClientImpl getWebServiceClientImpl()
-  {
-    if (webServiceClientImpl==null)
-    {
-      String wscimplId = elem_.getAttribute("implId");
-      webServiceClientImpl = (WebServiceClientImpl)webServiceClientImpls_.get(wscimplId);
-    }
-    return webServiceClientImpl;
-  }
-  
-
-
-
-  public String getWebServiceClientTypeId()
-  {
-    if (webServiceClientTypeId==null)
-    {
-      webServiceClientTypeId = elem_.getAttribute("webServiceClientTypeId");
-    }
-    return webServiceClientTypeId;
-  }
-  
-
-
-	
-	
-	
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/wsrt/Context.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/wsrt/Context.java
deleted file mode 100644
index d0874d4..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/wsrt/Context.java
+++ /dev/null
@@ -1,143 +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.wsrt;
-
-import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceScenario;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IContext;
-
-/**
- * @author rsinha
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class Context implements IContext {	
-	private WebServiceScenario scenario;
-	private boolean develop;
-	private boolean assemble;
-	private boolean deploy;
-	private boolean install;
-	private boolean run;
-	private boolean client;
-	private boolean test;
-	private boolean publish;
-	private boolean overWriteFiles;
-	private boolean createFolders;
-	private boolean checkOutFiles;
-	
-	public boolean getAssemble() {
-		return assemble;
-	}
-	
-	public boolean getCheckOutFiles() {
-		return checkOutFiles;
-	}
-	
-	public boolean getClient() {
-		return client;
-	}
-	
-	public boolean getCreateFolders() {
-		return createFolders;
-	}
-	
-	public boolean getDeploy() {
-		return deploy;
-	}
-	
-	public boolean getDevelop() {
-		return develop;
-	}
-	
-	public boolean getInstall() {
-		return install;
-	}
-	
-	public boolean getOverWriteFiles() {
-		return overWriteFiles;
-	}
-	
-	public boolean getPublish() {
-		return publish;
-	}
-	
-	public boolean getRun() {
-		return run;
-	}
-	
-	public WebServiceScenario getScenario() {
-		return scenario;
-	}
-	
-	public boolean getTest() {
-		return test;
-	}
-
-	public void setAssemble(boolean assemble) {
-		this.assemble = assemble;
-	}
-	
-
-	public void setCheckOutFiles(boolean checkOutFiles) {
-		this.checkOutFiles = checkOutFiles;
-	}
-	
-
-	public void setClient(boolean client) {
-		this.client = client;
-	}
-	
-
-	public void setCreateFolders(boolean createFolders) {
-		this.createFolders = createFolders;
-	}
-	
-
-	public void setDeploy(boolean deploy) {
-		this.deploy = deploy;
-	}
-	
-
-	public void setDevelop(boolean develop) {
-		this.develop = develop;
-	}
-	
-
-	public void setInstall(boolean install) {
-		this.install = install;
-	}
-	
-
-	public void setOverWriteFiles(boolean overWriteFiles) {
-		this.overWriteFiles = overWriteFiles;
-	}
-	
-
-	public void setPublish(boolean publish) {
-		this.publish = publish;
-	}
-	
-
-	public void setRun(boolean run) {
-		this.run = run;
-	}
-	
-
-	public void setScenario(WebServiceScenario scenario) {
-		this.scenario = scenario;
-	}
-	
-
-	public void setTest(boolean test) {
-		this.test = test;
-	}		
-	
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/wsrt/Selection.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/wsrt/Selection.java
deleted file mode 100644
index a5bf53a..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/wsrt/Selection.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.jst.ws.internal.wsrt;
-
-import org.eclipse.wst.ws.internal.provisional.wsrt.ISelection;
-
-public class Selection implements ISelection {
-
-	private Object[] selection;
-	
-	public Object[] getSelection() 
-	{
-		return selection;
-	}
-	
-	public void setSelection(Object[] selection)
-	{
-		this.selection = selection;
-	}
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/wsrt/ServiceType.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/wsrt/ServiceType.java
deleted file mode 100644
index 9c4cff2..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/wsrt/ServiceType.java
+++ /dev/null
@@ -1,180 +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.wsrt;
-
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.StringTokenizer;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jst.ws.internal.consumption.ui.wizard.IWebServiceType;
-
-public class ServiceType {
-
-  private IConfigurationElement elem_;
-  private Hashtable webServiceImpls_;
-  private HashMap webServiceTypes_;
-	private String id;
-	private WebServiceImpl webServiceImpl;
-	private String[] bottomUpModuleTypesInclude;
-	private String[] topDownModuleTypesInclude;
-  private String[] bottomUpModuleTypesExclude;
-  private String[] topDownModuleTypesExclude;
-  private IWebServiceType webServiceType;
-  
-
-  
-  public ServiceType(IConfigurationElement elem_, Hashtable webServiceImpls_, HashMap webServiceTypes_)
-  {
-    super();
-    this.elem_ = elem_;
-    this.webServiceImpls_ = webServiceImpls_;
-    this.webServiceTypes_ = webServiceTypes_;
-  }
-
-  public String[] getBottomUpModuleTypesExclude()
-  {
-    if (bottomUpModuleTypesExclude==null)
-    {
-      String attr = elem_.getAttribute("buModuleTypesExclude");
-      if (attr != null && attr.length()>0)
-      {
-        StringTokenizer st = new StringTokenizer(attr, " ");
-        int size = st.countTokens();
-        bottomUpModuleTypesExclude = new String[size];
-        for (int i = 0; i < bottomUpModuleTypesExclude.length; i++)
-          bottomUpModuleTypesExclude[i] = st.nextToken();
-      }
-    }
-    return bottomUpModuleTypesExclude;
-  }
-  
-  public void setBottomUpModuleTypesExclude(String[] bottomUpModuleTypesExclude)
-  {
-    this.bottomUpModuleTypesExclude = bottomUpModuleTypesExclude;
-  }
-  
-  public String[] getBottomUpModuleTypesInclude()
-  {
-    if (bottomUpModuleTypesInclude==null)
-    {
-      String attr = elem_.getAttribute("buModuleTypesInclude");
-      if (attr != null && attr.length()>0)
-      {
-        StringTokenizer st = new StringTokenizer(attr, " ");
-        int size = st.countTokens();
-        bottomUpModuleTypesInclude = new String[size];
-        for (int i = 0; i < bottomUpModuleTypesInclude.length; i++)
-          bottomUpModuleTypesInclude[i] = st.nextToken();
-      }
-    }
-    return bottomUpModuleTypesInclude;
-  }
-  
-  public void setBottomUpModuleTypesInclude(String[] bottomUpModuleTypesInclude)
-  {
-    this.bottomUpModuleTypesInclude = bottomUpModuleTypesInclude;
-  }
-  
-  public String getId()
-  {
-    if (id==null)
-    {
-      id = elem_.getAttribute("id");
-    }
-    return id;
-  }
-  
-  public void setId(String id)
-  {
-    this.id = id;
-  }
-  
-  public String[] getTopDownModuleTypesExclude()
-  {
-    if (topDownModuleTypesExclude==null)
-    {
-      String attr = elem_.getAttribute("tdModuleTypesExclude");
-      if (attr != null && attr.length()>0)
-      {
-        StringTokenizer st = new StringTokenizer(attr, " ");
-        int size = st.countTokens();
-        topDownModuleTypesExclude = new String[size];
-        for (int i = 0; i < topDownModuleTypesExclude.length; i++)
-          topDownModuleTypesExclude[i] = st.nextToken();
-      }
-    }
-    return topDownModuleTypesExclude;
-  }
-  
-  public void setTopDownModuleTypesExclude(String[] topDownModuleTypesExclude)
-  {
-    this.topDownModuleTypesExclude = topDownModuleTypesExclude;
-  }
-  
-  public String[] getTopDownModuleTypesInclude()
-  {
-    if (topDownModuleTypesInclude==null)
-    {
-      String attr = elem_.getAttribute("tdModuleTypesInclude");
-      if (attr != null && attr.length()>0)
-      {
-        StringTokenizer st = new StringTokenizer(attr, " ");
-        int size = st.countTokens();
-        topDownModuleTypesInclude = new String[size];
-        for (int i = 0; i < topDownModuleTypesInclude.length; i++)
-          topDownModuleTypesInclude[i] = st.nextToken();
-      }
-    }
-    return topDownModuleTypesInclude;
-  }
-  
-  public void setTopDownModuleTypesInclude(String[] topDownModuleTypesInclude)
-  {
-    this.topDownModuleTypesInclude = topDownModuleTypesInclude;
-  }
-  
-  public IWebServiceType getWebSerivceType()
-  {
-    if (webServiceType==null)
-    {
-      String wsid = elem_.getAttribute("webServiceTypeId");
-      webServiceType = (IWebServiceType)webServiceTypes_.get(wsid);
-    }
-    return webServiceType;
-  }
-  
-  public void setWebServiceType(IWebServiceType webServiceType)
-  {
-    this.webServiceType = webServiceType;
-  }
-  
-  public WebServiceImpl getWebServiceImpl()
-  {
-    if (webServiceImpl == null)
-    {
-      String wsimplId = elem_.getAttribute("implId");
-      webServiceImpl = (WebServiceImpl)webServiceImpls_.get(wsimplId);
-    }
-    return webServiceImpl;
-  }
-  
-  public void setWebServiceImpl1(WebServiceImpl webServiceImpl)
-  {
-    this.webServiceImpl = webServiceImpl;
-  }
-  
-	
-  
-	
-	
-	
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/wsrt/WebServiceClientImpl.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/wsrt/WebServiceClientImpl.java
deleted file mode 100644
index c4e3789..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/wsrt/WebServiceClientImpl.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.jst.ws.internal.wsrt;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-
-public class WebServiceClientImpl {
-
-  private IConfigurationElement elem_; 
-	private String id;
-	private String label;
-  
-  public WebServiceClientImpl(IConfigurationElement elem_)
-  {
-    super();
-    this.elem_ = elem_;
-  }
-
-  public String getId()
-  {
-    if (id==null)
-    {
-      id = elem_.getAttribute("id");
-    }
-    return id;
-  }
-  
-
-  public String getLabel()
-  {
-    if (label==null)
-    {
-      label = elem_.getAttribute("label");
-    }
-    return label;
-  }	
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/wsrt/WebServiceImpl.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/wsrt/WebServiceImpl.java
deleted file mode 100644
index c9c5d59..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/wsrt/WebServiceImpl.java
+++ /dev/null
@@ -1,91 +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.wsrt;
-
-import java.util.StringTokenizer;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-
-public class WebServiceImpl {
-	
-  private IConfigurationElement elem_;
-	private String id;
-	private String label;
-	private String[] resourceTypeMetadata;
-	private String[] extensionMetadata;
-  
-  public WebServiceImpl(IConfigurationElement elem_)
-  {
-    super();
-    this.elem_ = elem_;
-  }
-
-  public String[] getExtensionMetadata()
-  {
-    if (extensionMetadata==null)
-    {
-      String attr = elem_.getAttribute("extensionMetadata");
-      if (attr != null && attr.length()>0)
-      {
-        StringTokenizer st = new StringTokenizer(attr, " ");
-        int size = st.countTokens();
-        extensionMetadata = new String[size];
-        for (int i = 0; i < extensionMetadata.length; i++)
-          extensionMetadata[i] = st.nextToken();
-      }      
-    }
-    return extensionMetadata;
-  }
-  
-
-  public String getId()
-  {
-    if (id==null)
-    {
-      id = elem_.getAttribute("id");
-    }
-    return id;
-  }
-  
-
-  public String getLabel()
-  {
-    if (label==null)
-    {
-      label = elem_.getAttribute("label");
-    }
-    return label;
-  } 
-  
-
-  public String[] getResourceTypeMetadata()
-  {
-    if (resourceTypeMetadata==null)
-    {
-      String attr = elem_.getAttribute("resourceTypeMetadata");
-      if (attr != null && attr.length()>0)
-      {
-        StringTokenizer st = new StringTokenizer(attr, " ");
-        int size = st.countTokens();
-        resourceTypeMetadata = new String[size];
-        for (int i = 0; i < resourceTypeMetadata.length; i++)
-          resourceTypeMetadata[i] = st.nextToken();
-      }      
-    }
-    return resourceTypeMetadata;
-  }
-  
-	
-  
-  
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/wsrt/WebServiceRuntimeExtensionRegistry.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/wsrt/WebServiceRuntimeExtensionRegistry.java
deleted file mode 100644
index 518ce54..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/wsrt/WebServiceRuntimeExtensionRegistry.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 Eclipse Public License v1.0
- * which accompanies 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.wsrt;
-
-import java.util.HashMap;
-import java.util.Hashtable;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-
-import org.eclipse.jst.ws.internal.consumption.ui.wizard.WebServiceTypeImpl;
-
-public class WebServiceRuntimeExtensionRegistry
-{
-
-  private static WebServiceRuntimeExtensionRegistry instance_;
-
-  HashMap webServiceTypes_;
-
-  Hashtable webServiceImpls_;
-
-  Hashtable webServiceClientImpls_;
-
-  Hashtable serviceTypes_;
-
-  Hashtable clientTypes_;
-
-  Hashtable webServiceRuntimes_;
-
-  /**
-   * Returns a singleton instance of this class.
-   * 
-   * @return A singleton WebServiceRuntimeExtensionRegistry object.
-   */
-  public static WebServiceRuntimeExtensionRegistry getInstance()
-  {
-    if (instance_ == null)
-    {
-      instance_ = new WebServiceRuntimeExtensionRegistry();
-      instance_.load();
-    }
-    return instance_;
-  }
-
-  private void load()
-  {
-    // Can't get rid of webServiceTypes in M4
-    webServiceTypes_ = new HashMap();
-    webServiceImpls_ = new Hashtable();
-    webServiceClientImpls_ = new Hashtable();
-    serviceTypes_ = new Hashtable();
-    clientTypes_ = new Hashtable();
-    webServiceRuntimes_ = new Hashtable();
-
-    IExtensionRegistry reg = Platform.getExtensionRegistry();
-  
-    //Load WebServiceTypes
-    IConfigurationElement[] config = reg.getConfigurationElementsFor(
-                                     "org.eclipse.jst.ws.consumption.ui",
-                                     "webServiceServerRuntimeType");
-    
-    for(int idx=0; idx<config.length; idx++) 
-    {
-      IConfigurationElement elem = config[idx];
-
-        if (elem.getName().equals("webServiceType"))
-        {
-          WebServiceTypeImpl wst = new WebServiceTypeImpl(elem);
-          webServiceTypes_.put(elem.getAttribute("id"), wst);
-        }        
-    }
-
-    //Load WebServiceImpls
-    IConfigurationElement[] wsImplExts = reg.getConfigurationElementsFor(
-        "org.eclipse.jst.ws.consumption.ui", "wsImpl");
-    
-    for(int idx=0; idx<wsImplExts.length; idx++) 
-    {
-      IConfigurationElement elem = wsImplExts[idx];
-
-        if (elem.getName().equals("webServiceImpl"))
-        {
-          WebServiceImpl wsimpl = new WebServiceImpl(elem);
-          webServiceImpls_.put(elem.getAttribute("id"), wsimpl);
-        }        
-    }
-    
-    //Load WebServiceClientImpls
-    IConfigurationElement[] wsClientImplExts = reg.getConfigurationElementsFor(
-        "org.eclipse.jst.ws.consumption.ui", "wsClientImpl");
-    
-    for(int idx=0; idx<wsClientImplExts.length; idx++) 
-    {
-      IConfigurationElement elem = wsClientImplExts[idx];
-
-        if (elem.getName().equals("webServiceClientImpl"))
-        {
-          WebServiceClientImpl wsClientImpl = new WebServiceClientImpl(elem);
-          webServiceClientImpls_.put(elem.getAttribute("id"), wsClientImpl);
-        }        
-    }
-    
-    //Load ServiceTypes
-    IConfigurationElement[] serviceTypeExts = reg.getConfigurationElementsFor(
-        "org.eclipse.jst.ws.consumption.ui", "serviceType");
-    
-    for(int idx=0; idx<serviceTypeExts.length; idx++) 
-    {
-      IConfigurationElement elem = serviceTypeExts[idx];
-
-        if (elem.getName().equals("serviceType"))
-        {
-          ServiceType st = new ServiceType(elem,webServiceImpls_,webServiceTypes_);
-          serviceTypes_.put(elem.getAttribute("id"), st);
-        }        
-    }
-    
-    //Load ClientTypes
-    IConfigurationElement[] clientTypeExts = reg.getConfigurationElementsFor(
-        "org.eclipse.jst.ws.consumption.ui", "clientType");
-    
-    for(int idx=0; idx<clientTypeExts.length; idx++) 
-    {
-      IConfigurationElement elem = clientTypeExts[idx];
-
-        if (elem.getName().equals("clientType"))
-        {
-          ClientType ct = new ClientType(elem,webServiceClientImpls_);
-          clientTypes_.put(elem.getAttribute("id"), ct);
-        }        
-    }
-    
-    //Load WebSerivceRuntimes
-    IConfigurationElement[] wsrtExts = reg.getConfigurationElementsFor(
-        "org.eclipse.jst.ws.consumption.ui", "webServiceRuntime");
-    
-    for(int idx=0; idx<wsrtExts.length; idx++) 
-    {
-      IConfigurationElement elem = wsrtExts[idx];
-
-        if (elem.getName().equals("webServiceRuntime"))
-        {
-          WebServiceRuntimeInfo wsrtInfo = new WebServiceRuntimeInfo(elem, serviceTypes_, clientTypes_);
-          webServiceRuntimes_.put(elem.getAttribute("id"), wsrtInfo);
-        }        
-    }
-  }  
-    
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/wsrt/WebServiceRuntimeExtensionUtils.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/wsrt/WebServiceRuntimeExtensionUtils.java
deleted file mode 100644
index 5150e09..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/wsrt/WebServiceRuntimeExtensionUtils.java
+++ /dev/null
@@ -1,641 +0,0 @@
-package org.eclipse.jst.ws.internal.wsrt;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.StringTokenizer;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.internal.project.IEJBNatureConstants;
-import org.eclipse.jst.ws.internal.consumption.ui.wizard.IWebServiceType;
-import org.eclipse.jst.ws.internal.consumption.ui.wizard.TypeSelectionFilter;
-import org.eclipse.jst.ws.internal.consumption.ui.wizard.WebServiceTypeImpl;
-import org.eclipse.jst.ws.internal.data.LabelsAndIds;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.IServerType;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.server.ui.ServerUICore;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceRuntime;
-
-public class WebServiceRuntimeExtensionUtils
-{
-  private static WebServiceRuntimeExtensionRegistry registry = WebServiceRuntimeExtensionRegistry.getInstance();
-  
-  public static IWebServiceRuntime getWebServiceRuntime( String runtimeId )
-  {
-	WebServiceRuntimeInfo wsrtInfo       		= getWebServiceRuntimeById(runtimeId);
-	IWebServiceRuntime    webserviceRuntime     = null;
-	if (wsrtInfo != null)
-	{
-		webserviceRuntime = wsrtInfo.getWebServiceRuntime();
-	}
-	
-	return webserviceRuntime;
-  }
-  
-  public static IWebServiceType getWebServiceTypeById(String id)
-  {
-    Object result = registry.webServiceTypes_.get(id);
-	
-    if (result!=null)
-    {
-      return (WebServiceTypeImpl)result;
-    }
-    return null;
-  }
-  
-  public static WebServiceRuntimeInfo getWebServiceRuntimeById(String id)
-  {
-    Object result = registry.webServiceRuntimes_.get(id);
-    if (result!=null)
-    {
-      return (WebServiceRuntimeInfo)result;
-    }
-    return null;
-  }  
-  
-  public static WebServiceRuntimeInfo getWebServiceRuntimeByLabel(String label)
-  {
-    Iterator iter = registry.webServiceRuntimes_.values().iterator();
-    while (iter.hasNext())
-    {
-      WebServiceRuntimeInfo wsr = (WebServiceRuntimeInfo)iter.next();
-      if (wsr!=null) {
-        if (label.equals(wsr.getLabel()))
-          return wsr;
-      }
-    }
-    return null;      
-  }  
-  
-  public static String[] getRuntimesByType(String typeId) 
-  {
-    ArrayList ids = new ArrayList();
-    Iterator iter = registry.webServiceRuntimes_.values().iterator();
-    while (iter.hasNext())
-    {
-      WebServiceRuntimeInfo wsr = (WebServiceRuntimeInfo)iter.next();
-      ServiceType[] sts = wsr.getServiceTypes();
-      for (int i=0; i<sts.length; i++)
-      {
-        IWebServiceType wstype = sts[i].getWebSerivceType();
-        if (typeId.equals(wstype.getId()))
-        {
-          ids.add(wsr.getId());
-          break;
-        }        
-      }
-    }
-    
-    if (ids.size() > 0)
-    {
-      String[] runtimeIds = (String[])ids.toArray(new String[0]);
-      return runtimeIds;
-    }
-    
-    return null;
-  }  
-  
-  public static String[] getServerFactoryIdsByType(String typeId) 
-  {
-    String[] wsrts = getRuntimesByType(typeId);
-    if (wsrts == null )
-    {
-      return null;
-    }
-      
-    ArrayList ids = new ArrayList();
-    for (int i=0; i<wsrts.length ;i++)
-    {
-      String[] fIds = getWebServiceRuntimeById(wsrts[i]).getServerFactoryIds();
-      if (fIds != null)
-      {
-        for (int j=0; j<fIds.length; j++)
-        {
-          if (!ids.contains(fIds[j]))
-          {
-            ids.add(fIds[j]);
-          }
-        }
-      }
-    }
-    
-    if (ids.size() > 0)
-    {
-      String[] serverFactoryIds = (String[])ids.toArray(new String[0]);
-      return serverFactoryIds;
-    }
-    
-    return null;    
-  }
-  
-  public static boolean isServerSupportedForChosenType(String typeId, String serverFactoryId)
-  {
-    String[] fIds = getServerFactoryIdsByType(typeId);
-    if (fIds == null)
-    {
-      return false;
-    }
-
-    for (int i=0;i<fIds.length;i++)
-    {
-      if (serverFactoryId.equals(fIds[i]))
-      {
-        return true;
-      }      
-    }
-    
-    return false;
-  }  
-  
-  public boolean isRuntimeSupportedForType(String typeId, String runtimeId)
-  {
-    String[] rIds = getRuntimesByType(typeId);
-    if (rIds == null)
-    {
-      return false;
-    }
-
-    for (int i=0;i<rIds.length;i++)
-    {
-      if (runtimeId.equals(rIds[i]))
-      {
-        return true;
-      }      
-    }
-    
-    return false;
-  }  
-  
-  public static boolean isServerRuntimeTypeSupported(String serverFactoryId, String runtimeId, String typeId)  
-  {
-    String[] rIds = getRuntimesByType(typeId);
-    if (rIds == null)
-    {
-      return false;
-    }
-    
-    for (int i = 0; i < rIds.length; i++)
-    {
-      if (runtimeId.equals(rIds[i]))
-      {
-        String[] fIds = getWebServiceRuntimeById(rIds[i]).getServerFactoryIds();
-        if (fIds != null)
-        {
-          for (int j = 0; j < fIds.length; j++)
-          {
-            if (serverFactoryId.equals(fIds[j]))
-            {
-              // Found it!
-              return true;
-            }
-          }
-        }
-      }
-    }  
-    
-    return false;
-  }
-  
-  public static boolean doesRuntimeSupportJ2EELevel(String j2eeVersionId, String runtimeId)
-  {
-    WebServiceRuntimeInfo wsrt = getWebServiceRuntimeById(runtimeId);
-    if (wsrt==null)
-      return false;
-    
-    String[] j2eeVersions = wsrt.getJ2eeLevels();
-    if (j2eeVersions==null || j2eeVersions.length==0) 
-      return true;
-    
-    for(int i=0; i<j2eeVersions.length; i++)
-    {
-      if (j2eeVersions[i].equals(j2eeVersionId))
-      {
-        return true;
-      }
-    }
-    return false;        
-  }
-  
-  public boolean doesRuntimeSupportServerTarget(String serverTargetId, String runtimeId)
-  {
-    WebServiceRuntimeInfo wsrt = getWebServiceRuntimeById(runtimeId);
-    if (wsrt==null)
-      return false;
-    
-    String[] fIds = wsrt.getServerFactoryIds();
-    for(int i=0;i<fIds.length;i++)
-    {
-      IServerType serverType = ServerCore.findServerType(fIds[i]);
-      if (serverType == null)
-        continue;
-      
-      String thisServerTargetId = serverType.getRuntimeType().getId(); 
-      if (thisServerTargetId.equals(serverTargetId))
-        return true;
-    }
-    
-    return false;
-  }
-  
-  /**
-   * Returns a list of valid projects for the Web service type with an id of typeId.
-   * In the case where the Web service type extension does not specify which project
-   * natures are included, a array of all Web and EJB projects in the workspace will
-   * be returned.
-   * @param typeId
-   * @return IProject[] an array of valid projects
-   */
-  public static IProject[] getProjectsByWebServiceType(String typeId)
-  {
-    IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
-    ArrayList validProjects = new ArrayList();
-    for (int i = 0; i < projects.length; i++)
-    {
-			if (!projects[i].getName().equals("Servers"))
-			{
-				validProjects.add(projects[i]);
-			}
-    }
-		
-		return (IProject[])validProjects.toArray(new IProject[0]); 
-		// rsktodo
-		/*
-    IWebServiceType wst = getWebServiceTypeById(typeId);
-    if (wst != null)
-    {
-      IConfigurationElement elem = wst.getConfigurationElement();
-      String includedNatures = elem.getAttribute("includeNatures");
-      String excludedNatures = elem.getAttribute("excludeNatures");
-      if (includedNatures!=null && includedNatures.length()>0)
-      {
-        for (int i = 0; i < projects.length; i++)
-        {
-          if (include(projects[i], includedNatures) && exclude(projects[i], excludedNatures))
-            validProjects.add(projects[i]);
-        }
-        return (IProject[])validProjects.toArray(new IProject[0]);
-      }
-    }
-    
-    //If wst was null or the extension didn't specify which project natures are
-    // to be included, revert to the old behaviour
-    for (int j = 0; j < projects.length; j++)
-    {
-      if (ResourceUtils.isWebProject(projects[j]) || ResourceUtils.isEJBProject(projects[j]))
-        validProjects.add(projects[j]);
-    }    
-    return (IProject[])validProjects.toArray(new IProject[0]);
-		*/
-		// rsktodo
-  }  
-  
-  private static boolean include(IProject project, String include)
-  {
-    StringTokenizer st = new StringTokenizer(include);
-    while(st.hasMoreTokens())
-    {
-      try
-      {
-        if (project.hasNature(st.nextToken()))
-          return true;
-      }
-      catch (CoreException ce)
-      {
-      }
-    }
-    return false;
-  }
-
-  private static boolean exclude(IProject project, String exclude)
-  {
-    StringTokenizer st = new StringTokenizer(exclude);
-    while(st.hasMoreTokens())
-    {
-      try
-      {
-        if (project.hasNature(st.nextToken()))
-          return false;
-      }
-      catch (CoreException ce)
-      {
-      }
-    }
-    return true;
-  }  
-
-  
-  public static LabelsAndIds getServiceTypeLabels()
-  {
-    LabelsAndIds labelIds = new LabelsAndIds();
-    Iterator     iterator = registry.webServiceTypes_.values().iterator();
-    int          size     = registry.webServiceTypes_.size();
-    String[]     labels   = new String[size];
-    String[]     ids      = new String[size];
-    int          index    = 0;
-    
-    labelIds.setLabels_( labels );
-    labelIds.setIds_( ids );
-    
-    while( iterator.hasNext() ) 
-    {
-      WebServiceTypeImpl type = (WebServiceTypeImpl)iterator.next();
-      
-      ids[index]    = type.getId();
-      labels[index] = type.getLabel();
-      index++;
-    }    
-    
-    return labelIds;
-  }
-  
-  public static String getDefaultRuntimeValueFor(String typeId)
-  {
-    String[] rIds = getRuntimesByType(typeId);
-    if (rIds == null)
-    {
-      return null;
-    }
-    
-    return rIds[0];
-  }  
-  
-  public static String getDefaultServerValueFor(String typeId)
-  {
-    String[] fIds = getServerFactoryIdsByType(typeId);
-    if (fIds==null)
-      return null;
-    
-    return fIds[0];
-  }  
-  
-  public static String[] getWebServiceTypeBySelection(IStructuredSelection selection)
-  {
-    TypeSelectionFilter tsf = new TypeSelectionFilter();
-    String[] wst = tsf.getWebServiceTypeByInitialSelection(selection, registry.webServiceTypes_);
-    return wst == null ? null : wst;
-  }  
-  
-  /**
-   * Returns true if an EJB project is needed to host a Web service
-   * of the type identified by typeId. If multiple natureIds are specified in the 
-   * "includeNatures" attribute, only the first one is checked. If no natureIds are specified, 
-   * false is returned.
-   * 
-   * @deprecated  
-   * 	Should be refactored in future 
-   */
-  public static boolean requiresEJBProject(String typeId)
-  {
-    IWebServiceType wst = getWebServiceTypeById(typeId);
-    if (wst != null)
-    {
-      IConfigurationElement elem = wst.getConfigurationElement();
-      String includedNatures = elem.getAttribute("includeNatures");
-      if (includedNatures==null || includedNatures.length()==0)
-      {
-        return false;
-      }
-      else
-      {
-        StringTokenizer st = new StringTokenizer(includedNatures);
-        if(st.hasMoreTokens())
-        {
-          String firstIncludedNature = st.nextToken();
-          if (firstIncludedNature.equals(IEJBNatureConstants.NATURE_ID))
-            return true;
-        }
-      }
-    }
-    return false;
-  }  
-  
-  public static boolean requiresEJBModuleFor(String serverFactoryId, String runtimeId, String typeId)
-  {
-	  // rsktodo
-	  return false;
-  }  
-  
-  //Ported from the former WebServiceClientRegistry
-  
-  public static String getRuntimeLabelById(String runtimeId) 
-  {
-    WebServiceRuntimeInfo wsrt = getWebServiceRuntimeById(runtimeId);
-    if (wsrt == null)
-      return null;
-    
-    return wsrt.getLabel();
-  }  
-  
-  public static String getServerLabelById(String serverFactoryId)
-  {
-    IServerType serverType = ServerCore.findServerType(serverFactoryId);
-    if (serverType == null)
-      return null;
-    
-    String serverLabel = ServerUICore.getLabelProvider().getText(serverType);   
-    return serverLabel;
-  }
-  
-  public static String getServerInstanceLabelFromInstanceId( String instanceId )
-  {
-    IServer server = ServerCore.findServer( instanceId );    
-    return server.getName();
-  }  
-  
-  
-  public static String[] getRuntimesByClientType(String clientTypeId) 
-  {
-    ArrayList ids = new ArrayList();
-    Iterator iter = registry.webServiceRuntimes_.values().iterator();
-    while (iter.hasNext())
-    {
-      WebServiceRuntimeInfo wsr = (WebServiceRuntimeInfo)iter.next();
-      ClientType[] cts = wsr.getClientTypes();
-      for (int i=0; i<cts.length; i++)
-      {
-        String wsctypeId = cts[i].getWebServiceClientTypeId();
-        if (wsctypeId.equals(clientTypeId))
-        {
-          ids.add(wsr.getId());
-          break;
-        }        
-      }
-    }
-    
-    if (ids.size() > 0)
-    {
-      String[] runtimeIds = (String[])ids.toArray(new String[0]);
-      return runtimeIds;
-    }
-    
-    return null;    
-  }
-
-  
-  public static boolean webServiceClientRuntimeTypeExists(String serverFactoryId, String runtimeId, String clientTypeId) 
-  {
-    String[] rIds = getRuntimesByClientType(clientTypeId);
-    if (rIds == null)
-    {
-      return false;
-    }
-    
-    for (int i = 0; i < rIds.length; i++)
-    {
-      if (runtimeId.equals(rIds[i]))
-      {
-        String[] fIds = getWebServiceRuntimeById(rIds[i]).getServerFactoryIds();
-        if (fIds != null)
-        {
-          for (int j = 0; j < fIds.length; j++)
-          {
-            if (serverFactoryId.equals(fIds[j]))
-            {
-              // Found it!
-              return true;
-            }
-          }
-        }
-      }
-    }  
-    
-    return false;
-  }
-  
-  public static String[] getAllClientRuntimes() 
-  {
-    ArrayList ids = new ArrayList();
-    Iterator iter = registry.webServiceRuntimes_.values().iterator();
-    while (iter.hasNext())
-    {
-      WebServiceRuntimeInfo wsr = (WebServiceRuntimeInfo)iter.next();
-      ClientType[] cts = wsr.getClientTypes();
-      if (cts!=null && cts.length>0)
-      {
-        //this runtime supports the client scenario
-        ids.add(wsr.getId());
-      }
-    }
-    
-    if (ids.size() > 0)
-    {
-      String[] runtimeIds = (String[])ids.toArray(new String[0]);
-      return runtimeIds;
-    }
-    
-    return null;
-  }
-  
-
-  public static String[] getAllClientServerFactoryIds() 
-  {    
-    String[] rIds = getAllClientRuntimes();
-    if (rIds==null)
-      return null;
-    
-    ArrayList ids = new ArrayList();
-    for (int i=0; i<rIds.length ;i++)
-    {
-      String[] fIds = getWebServiceRuntimeById(rIds[i]).getServerFactoryIds();
-      if (fIds != null)
-      {
-        for (int j=0; j<fIds.length; j++)
-        {
-          if (!ids.contains(fIds[j]))
-          {
-            ids.add(fIds[j]);
-          }
-        }
-      }
-    }
-    
-    if (ids.size() > 0)
-    {
-      String[] serverFactoryIds = (String[])ids.toArray(new String[0]);
-      return serverFactoryIds;
-    }
-    
-    return null;
-  }
-  
-  public static String[] getClientProjectTypes(String clientTypeId, String runtimeId)
-  {
-    String[] rIds = getRuntimesByClientType(clientTypeId);
-    if (rIds == null)
-    {
-      return null;
-    }
-    
-    for (int i = 0; i < rIds.length; i++)
-    {
-      if (runtimeId.equals(rIds[i]))
-      {
-        ClientType[] cts = getWebServiceRuntimeById(rIds[i]).getClientTypes();
-        for (int j=0; j<cts.length; j++)
-        {
-          String thisClientTypeId = cts[j].getWebServiceClientTypeId();
-          if (clientTypeId.equals(thisClientTypeId))
-          {
-            //Found the one!
-            String[] projectTypes = cts[j].getModuleTypesInclude();
-            return projectTypes;
-          }            
-        }
-      }
-    }  
-    
-    return null;    
-  }
-  
-  public static LabelsAndIds getClientTypeLabels()
-  {
-	  
-	  LabelsAndIds labelIds = new LabelsAndIds();
-	  String[] idsArray = new String[0];
-	  String[] labelsArray = new String[0];
-	  labelIds.setIds_(idsArray);
-	  labelIds.setLabels_(labelsArray);
-	
-	  String[] rIds = getAllClientRuntimes();
-	  if (rIds == null)
-	  {
-		  return labelIds;
-	  }
-	
-	  ArrayList ids = new ArrayList();
-	  ArrayList labels = new ArrayList();
-	
-	  for (int i=0; i < rIds.length; i++)
-	  {
-			WebServiceRuntimeInfo wsrt = getWebServiceRuntimeById(rIds[i]);
-			ClientType[] cts = wsrt.getClientTypes();
-			for (int j = 0; j < cts.length; j++)
-			{
-				ClientType ct = cts[j];
-				String id = ct.getWebServiceClientTypeId();
-				if (!ids.contains(id))
-				{
-					ids.add(id);
-					labels.add(ct.getWebServiceClientImpl().getLabel());
-				}
-		  }
-
-		}
-
-		if (ids.size() > 0)
-		{
-			idsArray = (String[]) ids.toArray(new String[0]);
-			labelsArray = (String[]) labels.toArray(new String[0]);
-			labelIds.setIds_(idsArray);
-			labelIds.setLabels_(labelsArray);
-		}
-
-		return labelIds;
-
-	}
-  
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/wsrt/WebServiceRuntimeInfo.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/wsrt/WebServiceRuntimeInfo.java
deleted file mode 100644
index 57e73cc..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/wsrt/WebServiceRuntimeInfo.java
+++ /dev/null
@@ -1,209 +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.wsrt;
-
-import java.util.Hashtable;
-import java.util.StringTokenizer;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceRuntime;
-
-
-public class WebServiceRuntimeInfo {
-
-  private IConfigurationElement elem_;
-  private Hashtable allServiceTypes_;
-  private Hashtable allClientTypes_;
-  
-  private String id;
-  private String label;
-	private ServiceType[] serviceTypes;
-	private ClientType[] clientTypes;
-	private java.lang.String[] servletLevels;
-	private java.lang.String[] j2eeLevels;
-	private java.lang.String[] runtimeIds;
-	private java.lang.String[] serverFactoryIds;
-	private String className;
-	private IWebServiceRuntime webServiceRuntime_;
-  
-  public WebServiceRuntimeInfo(IConfigurationElement elem_, Hashtable allServiceTypes_, Hashtable allClientTypes_)
-  {
-    super();
-    this.elem_ = elem_;
-    this.allServiceTypes_ = allServiceTypes_;
-    this.allClientTypes_ = allClientTypes_;
-  }
-
-  public String getClassName()
-  {
-    if (className==null)
-    {
-      className=elem_.getAttribute("class");
-    }
-    return className;
-  }
-  
-
-  public ClientType[] getClientTypes()
-  {
-    if (clientTypes==null)
-    {
-      String attr = elem_.getAttribute("clientTypes");
-      if (attr != null && attr.length()>0)
-      {
-        StringTokenizer st = new StringTokenizer(attr, " ");
-        int size = st.countTokens();
-        clientTypes = new ClientType[size];
-        for (int i = 0; i < clientTypes.length; i++)
-        {
-          String ctid = st.nextToken();          
-          clientTypes[i] = (ClientType)allClientTypes_.get(ctid);
-        }
-      }
-    }
-    return clientTypes;
-  }
-  
-
-  public String getId()
-  {
-    if (id==null)
-    {
-      id = elem_.getAttribute("id");
-    }
-    return id;
-  }
-  
-
-  public String getLabel()
-  {
-    if (label==null)
-    {
-      label = elem_.getAttribute("label");
-    }
-    return label;
-  }   
-
-  
-  public java.lang.String[] getJ2eeLevels()
-  {
-    if (j2eeLevels == null)
-    {
-      String attr = elem_.getAttribute("j2eeLevels");
-      if (attr != null && attr.length()>0)
-      {
-        StringTokenizer st = new StringTokenizer(attr, " ");
-        int size = st.countTokens();
-        j2eeLevels = new String[size];
-        for (int i = 0; i < j2eeLevels.length; i++)
-          j2eeLevels[i] = st.nextToken();
-      }
-    }      
-    
-    return j2eeLevels;
-  }
-  
-
-  public java.lang.String[] getRuntimeIds()
-  {
-    if (runtimeIds == null)
-    {
-      String attr = elem_.getAttribute("runtimes");
-      if (attr != null && attr.length()>0)
-      {
-        StringTokenizer st = new StringTokenizer(attr, " ");
-        int size = st.countTokens();
-        runtimeIds = new String[size];
-        for (int i = 0; i < runtimeIds.length; i++)
-          runtimeIds[i] = st.nextToken();
-      }
-    }      
-    
-    return runtimeIds;
-  }
-  
-
-  public java.lang.String[] getServerFactoryIds()
-  {
-    if (serverFactoryIds == null)
-    {
-      String attr = elem_.getAttribute("servers");
-      if (attr != null && attr.length()>0)
-      {
-        StringTokenizer st = new StringTokenizer(attr, " ");
-        int size = st.countTokens();
-        serverFactoryIds = new String[size];
-        for (int i = 0; i < serverFactoryIds.length; i++)
-          serverFactoryIds[i] = st.nextToken();
-      }      
-    }
-    return serverFactoryIds;
-  }
-  
-
-  public ServiceType[] getServiceTypes()
-  {
-    if (serviceTypes==null)
-    {
-      String attr = elem_.getAttribute("serviceTypes");
-      if (attr != null && attr.length()>0)
-      {
-        StringTokenizer st = new StringTokenizer(attr, " ");
-        int size = st.countTokens();
-        serviceTypes = new ServiceType[size];
-        for (int i = 0; i < serviceTypes.length; i++)
-        {
-          String ctid = st.nextToken();          
-          serviceTypes[i] = (ServiceType)allServiceTypes_.get(ctid);
-        }
-      }
-    }
-    return serviceTypes;
-  }
-  
-
-  public java.lang.String[] getServletLevels()
-  {
-    if (servletLevels==null)
-    {
-      String attr = elem_.getAttribute("servletLevels");
-      if (attr != null && attr.length()>0)
-      {
-        StringTokenizer st = new StringTokenizer(attr, " ");
-        int size = st.countTokens();
-        servletLevels = new String[size];
-        for (int i = 0; i < servletLevels.length; i++)
-          servletLevels[i] = st.nextToken();
-      }      
-    }
-    return servletLevels;
-  }
-  
-  public IWebServiceRuntime getWebServiceRuntime()
-  {
-	if (webServiceRuntime_ == null)
-	{
-		try
-		{
-			webServiceRuntime_ = (IWebServiceRuntime)elem_.createExecutableExtension("class");
-		}
-		catch(CoreException ce)
-		{
-			
-		}
-	}
-	
-	return webServiceRuntime_;
-  }
-  
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/.classpath b/bundles/org.eclipse.jst.ws.consumption/.classpath
deleted file mode 100644
index cfd4587..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="webserviceutils"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws.consumption/.cvsignore b/bundles/org.eclipse.jst.ws.consumption/.cvsignore
deleted file mode 100644
index 0a24de6..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-build.xml
-temp.folder
-webserviceutils.jar
-wsc.jar
diff --git a/bundles/org.eclipse.jst.ws.consumption/.project b/bundles/org.eclipse.jst.ws.consumption/.project
deleted file mode 100644
index b98513e..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/.project
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.ws.consumption</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.wst.wsdl</project>
-		<project>org.eclipse.wst.ws.apache.soap</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.consumption/build.properties b/bundles/org.eclipse.jst.ws.consumption/build.properties
deleted file mode 100644
index f30ad41..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/build.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-source.wsc.jar = src/
-src.includes = build.properties,\
-               doc/,\
-               plugin.properties,\
-               plugin.xml,\
-               src/,\
-               webserviceutils/
-jars.compile.order = wsc.jar,\
-                     webserviceutils.jar
-bin.includes = plugin.properties,\
-               plugin.xml,\
-               wsc.jar,\
-               webserviceutils.jar
-source.webserviceutils.jar = webserviceutils/
diff --git a/bundles/org.eclipse.jst.ws.consumption/plugin.properties b/bundles/org.eclipse.jst.ws.consumption/plugin.properties
deleted file mode 100644
index f484e26..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/plugin.properties
+++ /dev/null
@@ -1,19 +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 Consumption
-PLUGIN_PROVIDER=Eclipse.org
-XP_WSFINDER=org.eclipse.jst.ws.internal.consumption.wsfinder
-XP_WEB_SERVICE_START_SERVER_TYPE=WebServiceStartServerType
-XP_SERVER_DEFAULTER=Server Defaulter
diff --git a/bundles/org.eclipse.jst.ws.consumption/plugin.xml b/bundles/org.eclipse.jst.ws.consumption/plugin.xml
deleted file mode 100644
index 9af2296..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/plugin.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin
-   id="org.eclipse.jst.ws.consumption"
-   version="1.0.0"
-   name="%PLUGIN_NAME"
-   provider-name="%PLUGIN_PROVIDER"
-   class="org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin">
-
-   <runtime>
-      <library name="wsc.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-
-   <requires>
-      <import plugin="org.eclipse.jem"/>
-      <import plugin="org.eclipse.jem.workbench"/>
-      <import plugin="org.eclipse.emf.common"/>
-      <import plugin="org.eclipse.emf.ecore"/>
-      <import plugin="org.eclipse.jdt.core"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.xsd"/>
-      <import plugin="org.eclipse.debug.core"/>
-      <import plugin="org.eclipse.jst.ws"/>
-      <import plugin="org.eclipse.jdt.launching"/>
-      <import plugin="org.eclipse.wst.command.env.core"/>
-      <import plugin="org.eclipse.wst.command.env"/>
-      <import plugin="org.eclipse.jem.workbench"/>
-      <import plugin="org.eclipse.jface"/>
-      <import plugin="org.eclipse.wst.ws"/>
-      <import plugin="org.eclipse.wst.ws.parser"/>
-      <import plugin="org.eclipse.wst.server.core"/>
-      <import plugin="org.eclipse.wst.server.ui"/>
-      <import plugin="org.eclipse.jst.server.core"/>
-      <import plugin="org.eclipse.wst.wsdl"/>
-      <import plugin="org.eclipse.wst.internet.monitor.core"/>
-      <import plugin="org.eclipse.wst.common.emf"/>
-      <import plugin="org.eclipse.jst.j2ee.core"/>
-      <import plugin="org.eclipse.jst.j2ee.ejb"/>
-      <import plugin="org.eclipse.jst.j2ee"/>
-      <import plugin="org.eclipse.jst.j2ee.web"/>
-      <import plugin="org.eclipse.wst.common.emfworkbench.integration"/>
-      <import plugin="org.eclipse.wst.common.frameworks"/>
-      <import plugin="org.eclipse.jst.j2ee.ui"/>
-      <import plugin="org.eclipse.wst.web"/>
-      <import plugin="org.eclipse.wst.common.modulecore"/>
-      <import plugin="org.wsdl4j"/>
-      <import plugin="org.apache.wsil4j"/>
-   </requires>
-
-   <extension-point
-      id="wsfinder"
-      name="%XP_WSFINDER"/>
-
-   <!-- The following extension point will be removed. -->
-   <extension-point
-      id="webServiceStartServerType"
-      name="%XP_WEB_SERVICE_START_SERVER_TYPE"/>
-
-   <extension-point
-      id="serverDefaulter"
-      name="%XP_SERVER_DEFAULTER"/>
-
-   <extension
-         point="org.eclipse.jst.ws.consumption.webServiceStartServerType">
-      <webServiceStartServerType
-            factoryId="org.eclipse.jst.server.tomcat.32"
-            class="org.eclipse.jst.ws.internal.consumption.command.common.StartTomcatServer"
-            id="SERVER_ID_TOMCAT32_LOCAL">
-      </webServiceStartServerType>
-      <webServiceStartServerType
-            factoryId="org.eclipse.jst.server.tomcat.40"
-            class="org.eclipse.jst.ws.internal.consumption.command.common.StartTomcatServer"
-            id="SERVER_ID_TOMCAT40_LOCAL">
-      </webServiceStartServerType>
-      <webServiceStartServerType
-            factoryId="org.eclipse.jst.server.tomcat.41"
-            class="org.eclipse.jst.ws.internal.consumption.command.common.StartTomcatServer"
-            id="SERVER_ID_TOMCAT41_LOCAL">
-      </webServiceStartServerType>
-      <webServiceStartServerType
-            factoryId="org.eclipse.jst.server.tomcat.50"
-            class="org.eclipse.jst.ws.internal.consumption.command.common.StartTomcatServer"
-            id="SERVER_ID_TOMCAT50_LOCAL">
-      </webServiceStartServerType>
-   </extension>
-
-</plugin>
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/consumption/plugin.properties b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/consumption/plugin.properties
deleted file mode 100644
index 243f934..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/consumption/plugin.properties
+++ /dev/null
@@ -1,158 +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
-###############################################################################
-
-#
-# Sample messages
-#
-MSG_ERROR_JTS_PROXY_HAS_NO_METHODS=IWAB0179E Unable to create a sample to the proxy because the proxy does not contain methods.
-MSG_ERROR_JTS_PROXY_HAS_NO_DEFAULT=IWAB0180E Unable to create a sample to the proxy because the proxy is not a bean (i.e.. the sample does not have public default constructor).
-MSG_ERROR_JTS_NO_PROXY_METHODS_PROCESSED=IWAB0181E Unable to create a sample to the proxy because none of the methods in the proxy were processed.
-MSG_WARN_JTS_UNSUPPORTED_TYPE=IWAB0182W The Sample JSP client does not support the following type:
-MSG_WARN_JTS_UNSUPPORTED_INDEXED_PROPERTIES=IWAB0187W The Sample JSP client does not support Indexed properties.
-MSG_WARN_JTS_UNSUPPORTED_PARAMETERS_ARRAYS=IWAB0237W The Sample JSP client does not support arrays:
-MSG_WARN_JTS_UNSUPPORTED_PARAMETERS_INPUTS=IWAB0124W The Sample JSP client does not support input parameters that are not beans:
-MSG_ERROR_JTS_CYCLIC_BEAN=IWAB0188E The Sample JSP client does not support beans containing attributes that reference the beans.
-MSG_WARN_JTS_PROXY_METHODS_OMITTED=IWAB0189W The Sample JSP client omitted some methods because they contained unsupported types.
-MSG_ERROR_SAMPLE_CREATION_CANCELED=IWAB0021E Sample creation was canceled
-MSG_WARN_UNABLE_TO_FIND_PROXY=IWAB0022W The Proxy Resource cound not not be found.
-
-
-#
-# Filters
-#
-FILTER_MSG_ERROR_NULL_OBJECT=IWAB0097E No object has been provided.
-FILTER_MSG_ERROR_NOT_FILE=IWAB0098E The object "{0}" is not a file.
-FILTER_MSG_ERROR_NOT_FOLDER=IWAB0137E The object "{0}" is not a folder.
-
-JAVA_FILTER_NAME=Java files
-JAVA_FILTER_DESC=Files with names ending in ".java" or ".class".
-JAVA_FILTER_MSG_ERROR_WRONG_EXTENSION=IWAB0102E The file "{0}" does not end in ".java" or ".class".
-
-WSDL_FILTER_NAME=WSDL files
-WSDL_FILTER_DESC=Files with names ending in ".wsdl".
-WSDL_FILTER_MSG_ERROR_WRONG_EXTENSION=IWAB0103E The file "{0}" does not end in ".wsdl".
-
-ISD_FILTER_NAME=ISD files
-ISD_FILTER_DESC=Files with names ending in ".isd".
-ISD_FILTER_MSG_ERROR_WRONG_EXTENSION=IWAB0095E The file "{0}" does not end in ".isd".
-
-FOLDER_FILTER_NAME=Folders
-FOLDER_FILTER_DESC=Folders.
-
-
-#
-# Common messages
-#
-
-
-MSG_ERROR_PROJECT_NOT_FOUND=IWAB0069E Web project was not found.
-MSG_ERROR_INSTANCE_NOT_FOUND=IWAB0070E Server was not found.
-
-PROGRESS_INFO_PUBLISH_WEB_PROJECT=IWAB0072I Publishing Web project.
-
-#
-# Deployment status
-#
-PROGRESS_INFO_COPY_WEBSERVICE_UTILS=IWAB0023I Copying the webservice utilities.
-PROGRESS_INFO_COPYING_FILE=IWAB0197I Copying SOAP run-time file.
-PROGRESS_INFO_START_WEB_PROJECT=IWAB0198I Starting Web project.
-PROGRESS_INFO_PUBLISHING_SERVER=IWAB0199I Publishing server.
-PROGRESS_INFO_STARTING_SERVER=IWAB0200I Starting server.
-PROGRESS_INFO_PUBLISH_WEB_PROJECT=IWAB0205I Publishing Web project.
-
-
-#
-# Deployment messages
-#
-MSG_ERROR_PROJECT_NOT_FOUND=IWAB0207E Web project was not found.
-MSG_ERROR_FILECOPY_WEBSERVICE_UTILS=IWAB0024E Error in copying Webservice Utility file.
-MSG_ERROR_INSTANCE_NOT_FOUND=IWAB0212E Server was not found.
-MSG_ERROR_SERVER=IWAB0213E Error in starting server.
-MSG_ERROR_PUBLISH=IWAB0217E Error in publishing Web project.
-
-MSG_WARN_NO_DB_DRIVER=IWAB0221W Unable to locate db2java.zip, please ensure db2java.zip is added to the server class path.
-
-MSG_ERROR_BAD_SERVER_CONFIG=IWAB0534E Unable to add EAR project to Server Configuration.
-MSG_ERROR_CREATE_SERVER=IWAB0025E Unable to create server.
-
-
-
-#
-# EJB messages
-#
-TASK_LABEL_CREATE_EJB_PROJECT=CreateEJBProjectTask
-TASK_DESC_CREATE_EJB_PROJECT=Create an EJB Project.
-MSG_ERROR_CANNOT_CREATE_EJB_PROJECT=IWAB0432E Unable to create EJB project.
-MSG_ERROR_CANNOT_CREATE_APP_CLIENT_PROJECT=IWAB0026E Unable to create application client project {0}.
-MSG_ERROR_CANNOT_CREATE_JAVA_PROJECT=IWAB0027E Unable to create Java project {0}.
-MSG_ERROR_CANNOT_CREATE_EAR_PROJECT=IWAB0062E Unable to create EAR project {0}.
-
-#
-# WebServiceMappingPage Messages
-#
-
-#
-# Validator task descriptions
-#
-TASK_LABEL_WEBSERVICE_DISABLE_VALIDATION=Disable validators.
-TASK_DESC_WEBSERVICE_DISABLE_VALIDATION=Temporarily disabling validators.
-TASK_LABEL_WEBSERVICE_RESTORE_VALIDATION=Restore validators.
-TASK_DESC_WEBSERVICE_RESTORE_VALIDATION=Restoring states of validators.
-TASK_LABEL_WEBSERVICE_DISABLE_BUILD=Disable auto build.
-TASK_DESC_WEBSERVICE_DISABLE_BUILD=Temporarily disabling auto build.
-TASK_LABEL_WEBSERVICE_RESTORE_BUILD=Restore auto build.
-TASK_DESC_WEBSERVICE_RESTORE_BUILD=Restoring state of auto build.
-TASK_LABEL_WEBSERVICE_BUILD_PROJECT=Build project.
-TASK_DESC_WEBSERVICE_BUILD_PROJECT=Building project.
-
-#
-# MISC
-#
-TASK_DESC_CREATE_WEB_PROJECT=Create Web Project
-TASK_LABEL_CREATE_WEB_PROJECT=Create Web Project
-MSG_ERROR_WEB_PROJECT_CREATE=IWAB0310E An error occurred during creation of the Web Project.
-MSG_ERROR_SERVER_VIEW_OPEN=IWAB0126E The server configuration editor is open for {0}.  Close it and restart the wizard.
-
-#
-# Default Proxy project messages
-#
-
-
-#
-#	DetectNonJavaCharsCommand
-#
-MSG_WARN_JAVA_METHOD_START_WITH_UPPER_CASE=IWAB0129W Java method {0} in class {1} starts with an upper case letter. Method names should begin with lower case letters.
-MSG_WARN_METHOD_NAME_INVALID=IWAB0131W Java method {0} name contains underscore or numeric digits followed by a lower case letter.\
-Method names should not contain lower case letters after a numeric or underscore.
-MSG_WARN_BOOLEAN_PROPERTY_ACCESSORS=IWAB0132W Boolean property accessor {0} in bean {1} begins with "get". Boolean getter methods should begin wth "is".
-MSG_WARN_PACKAGE_NAME_HAS_UPPER_CASE=IWAB0133W The package name {0} of class {1} includes upper case letters. Package names should consist of lower case letters only.
-
-#
-# JavaToModelCommand
-#
-LABEL_OK=OK
-DESCRIPTION_OK=Select OK to continue
-
-LABEL_CANCEL=Cancel
-DESCRIPTION_CANCEL=Select Cancel to cancel
-
-#
-# CreateMonitorCommand
-#
-MSG_ERROR_UNABLE_TO_START_MONITOR=IWAB0001E Unable to monitor port {0} of {1}.
-MSG_INFO_MONITORING_NOT_SUPPORTED=IWAB0002I {0} does not support port monitoring.
-
-#
-# CopyWSDLCommand
-#
-COMMAND_LABEL_COPY_WSDL=Copying WSDL
-COMMAND_DESC_COPY_WSDL=Copying WSDL into the workspace for Web service deployment
-MSG_ERROR_COPY_WSDL=IWAB0028E Failed to copy WSDL {0} to {1}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/Generator.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/Generator.java
deleted file mode 100644
index 1ebafc3..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/Generator.java
+++ /dev/null
@@ -1,236 +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.consumption.codegen;
-
-import java.util.Vector;
-
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-
-
-
-/**
-* Objects of this class represent a generator.
-* */
-public class Generator implements VisitorAction
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
-  /**
-  * The StringBuffer that holds the codegen 
-  * */
-  protected StringBuffer fbuffer; 
-
-  /**
-  * The Visitor that calls the visit method 
-  * */
-  protected Visitor fVisitor; 
-
-  /**
-  * Vector that holds state data for this  generator 
-  * */
-  protected Vector fResidentVector;
- 
-  /*
-  * This int holds the current number 
-  */
-  protected int fUniqueNumber =0;
- 
-
-  protected String fClientFolderPath;
-
-  public static final String FACTORY = "Factory"; 
-
-  public static final String TAB = "    ";
-  public static final String DOUBLE_TAB = "        ";
-  public static final String SPACE = " ";
-  
-  /**
-  * Constructor.
-  * 
-  */
-  public Generator ()
-  {
-      fbuffer = new StringBuffer();
-      fResidentVector = new Vector(); 
-    
-  }
-
-  /**
-  * Constructor.
-  * @param StringBuffer Takes the buffer it will write code to
-  */
-  public Generator (StringBuffer buffer)
-  {
-      fbuffer = buffer;
-      fResidentVector = new Vector(); 
-  }
-  
-  public void initialize(String resident)
-  {
-    //nothing to be done but must be implemented
-  }
-  
-  public String getClientFolderPath()
-  {
-    return fClientFolderPath;
-  }
-
-  public void setClientFolderPath(String fClientFolderPath_)
-  {
-    fClientFolderPath = fClientFolderPath_;
-  }
-
-  protected String serviceName = "";
-  protected String portName = "";
-  protected String packageName = "";
-  protected String proxyBaseName = "";
-
-  public void setInfo(String service, String port, String packageName, String proxyBase)
-  {
-    serviceName = service;
-    portName = port;
-    this.packageName = packageName; 
-    proxyBaseName = proxyBase;  
-  }
-
-  private static final char[] BAD_SYMBOLS = {'-', ' '}; // symbols that can appear in the folder name but it is not allowed in a java bean name
-  private static final char UNDERSCORE = '_';	// replace the above ones by underscore
-  public String getSessionBeanId()
-  {
-    String name = getClientFolderPath();
-    int index = name.lastIndexOf("/");
-    index++;
-    String newName = name.substring(index);
-    for ( int i = 0; i < BAD_SYMBOLS.length; i++ ) {
-    	newName = newName.replace ( BAD_SYMBOLS[i], UNDERSCORE );
-    }
-    return newName+ "id";
-  }
-
-  /*
-  * The Number Factory is here for naming purposes. In 
-  * this way we insure no names we create in a piece of
-  * code gen are the same. We keep track of the numbers
-  * used and we hand back the next one. Like take a number 
-  * buddy
-  * @param int number we are at as the state data has to be settable
-  */
-  public void setNumberFactory(int number)
-  {
-     fUniqueNumber = number;
-  }
-
-
-  /*
-  * This is a unique number for state purposes
-  * @return int 
-  */
-  public int getNumberFactory()
-  {
-     return fUniqueNumber; 
-  }
-  /*
-  * This is a unique number for naming purposes
-  * @return int 
-  */
-  public int getUniqueNumber()
-  {
-     return fUniqueNumber++;
-  }
-
-
-  /**
-  * returns the current StringBuffer
-  * @return StringBuffer Takes the buffer it will write code too
-  */
-  public StringBuffer getStringBuffer ()
-  {
-      return fbuffer;
-  }
-
-  
-  /**
-  * returns the Visitor that called this generator
-  * @return Visitor 
-  */
-  public Visitor getVisitor ()
-  {
-      return fVisitor;
-  }
-  
-
-
-
-  /**
-  * vector used to hold state data 
-  * @parameter Visitor 
-  */
-  public void putResidentVector (Object object)
-  {
-      fResidentVector.addElement(object);
-  }
-  
-
-  /**
-  * vector used to hold state data 
-  * @parameter Visitor 
-  */
-  public void setResidentVector (Vector vector)
-  {
-      fResidentVector = vector;
-  }
-  
-
-  /**
-  * returns the resident vector
-  * @return Visitor 
-  */
-  public Vector getResidentVector ()
-  {
-      return fResidentVector;
-  }
-  
-
-  /**
-  * This function is used to initialize any state a generator may have
-  *
-  **/
-
-  public void initialize()
-  {
-     //to be implemented in sublasses
-  }
-
-
-   /**
-  * sets the visitor that calls the visit
-  * @parameter Visitor 
-  */
-
-  public void setVisitor(Visitor visitor)
-  {
-      fVisitor = visitor;
-  }
-
-
-  public Status visit (Object object)
-  {
-   //implemented by subclasses
-  	return new SimpleStatus("");
-  }
-  
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/RelVisitor.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/RelVisitor.java
deleted file mode 100644
index 7a72a54..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/RelVisitor.java
+++ /dev/null
@@ -1,89 +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.consumption.codegen;
-      
-import java.util.Enumeration;
-
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-import org.eclipse.wst.ws.internal.datamodel.Rel;
-
-
-/**
-* Objects of this class represent a visitor.
-* This vistor will visit elements in a model given a 
-* particular rel
-* */
-public class RelVisitor implements Visitor
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  private int fElementCounter;
-  private int fTotalElements;
-  private String frelName;
-
-  /**
-  * Constructor.
-  * 
-  */
-
-  public RelVisitor (String relName)
-  {
-     frelName = relName;
-  }
-  
-  public int getTotalElementsToVisit()
-  {
-     return fTotalElements;
-  }
-
-  public boolean isLastElement()
-  {
-     if(getTotalElementsToVisit() - presentElement() == 0) return true;
-     return false;
-  }
-
-  public int presentElement()
-  {
-     return fElementCounter;
-  }
-  
-  public void initialize(VisitorAction va)
-  {
-    //implemented by subclasses
-  }  
-  public Status run (Object sourceElement,VisitorAction vAction)
-  {
-  	    Status status = new SimpleStatus("");
-        initialize(vAction);
-  
-        vAction.setVisitor(this);
-        Rel rel = ((BasicElement)sourceElement).getRel(frelName);
-        //set some state data
-        fTotalElements = rel.getNumberOfTargetElements();
-        fElementCounter = 0;  
-        
-        Enumeration e = rel.getTargetElements();
-        while (e.hasMoreElements()){
-           BasicElement targetElement = (BasicElement)e.nextElement(); 
-           fElementCounter++;
-           initialize(vAction);
-           status = vAction.visit(targetElement);
-        }
-        return status;
-  } 
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/Visitor.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/Visitor.java
deleted file mode 100644
index 42fe69a..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/Visitor.java
+++ /dev/null
@@ -1,30 +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.consumption.codegen;
-
-import org.eclipse.wst.command.env.core.common.Status;
-
-
-/**
-* Objects of this class represent a visitor.
-* */
-public interface Visitor 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  public Status run (Object object, VisitorAction vAction);
-        
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/VisitorAction.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/VisitorAction.java
deleted file mode 100644
index b3b0b42..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/VisitorAction.java
+++ /dev/null
@@ -1,31 +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.consumption.codegen;
-
-import org.eclipse.wst.command.env.core.common.Status;
-
-
-/**
-* Objects of this class represent a VisitorAction.
-* The visitor walks the model and the VisitorAction 
-* does the action
-* */
-public interface VisitorAction 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  public Status visit (Object object);
-  public void setVisitor(Visitor visitor);
-  public void initialize(String residentString);
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/AttributeVisitor.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/AttributeVisitor.java
deleted file mode 100644
index 30ffda6..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/AttributeVisitor.java
+++ /dev/null
@@ -1,82 +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.consumption.codegen.bean;
-
-import java.util.Vector;
-
-import org.eclipse.jst.ws.internal.consumption.codegen.RelVisitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.VisitorAction;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeElement;
-import org.eclipse.jst.ws.internal.consumption.sampleapp.codegen.InputFileAttributeGenerator;
-
-
-/**
-* Objects of this class represent a visitor.
-* */
-public class AttributeVisitor extends RelVisitor
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  private String fResidentString; 
-  private Vector fResidentVector1;
-  private Vector fResidentVector2;
-
-   /**
-  * Constructor.
-  * 
-  */
-
-  public AttributeVisitor ()
-  {
-    super(TypeElement.REL_ATTRIBUTES);
-    fResidentString = "";
-  }
-
-  public AttributeVisitor (String rel)
-  {
-    super(rel);
-    fResidentString = "";
-  }
-  
-  public void setResidentString(String resident)
-  {
-    fResidentString = resident;
-  }
-
-  public void setResidentVector1(Vector resident)
-  {
-    fResidentVector1 = resident;
-  }
-
-  public void setResidentVector2(Vector resident)
-  {
-    fResidentVector2 = resident;
-  }
-
-  
-  public void initialize(VisitorAction vAction)
-  {
-     //hack for 197726
-
-     if(vAction instanceof InputFileAttributeGenerator){
-       if(fResidentVector1 == null) fResidentVector1=new Vector();
-       if(fResidentVector2 == null) fResidentVector2=new Vector();
-       ((InputFileAttributeGenerator)vAction).setParentGetters(fResidentVector1,fResidentVector2);
-     }
-  }
- 
-  
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/FieldVisitor.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/FieldVisitor.java
deleted file mode 100644
index d6db38b..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/FieldVisitor.java
+++ /dev/null
@@ -1,75 +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.consumption.codegen.bean;
-
-import java.util.Vector;
-
-import org.eclipse.jst.ws.internal.consumption.codegen.VisitorAction;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeElement;
-import org.eclipse.jst.ws.internal.consumption.sampleapp.codegen.InputFileAttributeGenerator;
-
-
-/**
-* Objects of this class represent a visitor.
-* */
-public class FieldVisitor extends AttributeVisitor
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  private String fResidentString; 
-  private Vector fResidentVector1;
-  private Vector fResidentVector2;
-
-   /**
-  * Constructor.
-  * 
-  */
-
-  public FieldVisitor ()
-  {
-    super(TypeElement.REL_FIELDS);
-    fResidentString = "";
-  }
-  
-  public void setResidentString(String resident)
-  {
-    fResidentString = resident;
-  }
-
-  public void setResidentVector1(Vector resident)
-  {
-    fResidentVector1 = resident;
-  }
-
-  public void setResidentVector2(Vector resident)
-  {
-    fResidentVector2 = resident;
-  }
-
-  
-  public void initialize(VisitorAction vAction)
-  {
-     //hack for 197726
-
-     if(vAction instanceof InputFileAttributeGenerator){
-       if(fResidentVector1 == null) fResidentVector1=new Vector();
-       if(fResidentVector2 == null) fResidentVector2=new Vector();
-       ((InputFileAttributeGenerator)vAction).setParentGetters(fResidentVector1,fResidentVector2);
-     }
-  }
- 
-  
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/MethodVisitor.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/MethodVisitor.java
deleted file mode 100644
index 3466462..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/MethodVisitor.java
+++ /dev/null
@@ -1,40 +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.consumption.codegen.bean;
-
-import org.eclipse.jst.ws.internal.consumption.codegen.RelVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.BeanElement;
-
-
-/**
-* Objects of this class represent a visitor.
-* */
-public class MethodVisitor extends RelVisitor
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  /**
-  * Constructor.
-  * 
-  */
-
-  public MethodVisitor ()
-  {
-     super(BeanElement.REL_METHODS);
-  }
-  
-   
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/ParameterVisitor.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/ParameterVisitor.java
deleted file mode 100644
index 0749312..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/ParameterVisitor.java
+++ /dev/null
@@ -1,40 +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.consumption.codegen.bean;
-
-import org.eclipse.jst.ws.internal.consumption.codegen.RelVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.MethodElement;
-
-
-/**
-* Objects of this class represent a visitor.
-* */
-public class ParameterVisitor extends RelVisitor
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  /**
-  * Constructor.
-  * 
-  */
-
-  public ParameterVisitor ()
-  {
-     super(MethodElement.REL_PARAMETERS);
-  }
-  
-   
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/ReturnParameterVisitor.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/ReturnParameterVisitor.java
deleted file mode 100644
index 1f62070..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/ReturnParameterVisitor.java
+++ /dev/null
@@ -1,40 +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.consumption.codegen.bean;
-
-import org.eclipse.jst.ws.internal.consumption.codegen.RelVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.MethodElement;
-
-
-/**
-* Objects of this class represent a visitor.
-* */
-public class ReturnParameterVisitor extends RelVisitor
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  /**
-  * Constructor.
-  * 
-  */
-
-  public ReturnParameterVisitor ()
-  {
-     super(MethodElement.REL_RETURN_PARAMETERS);
-  }
-  
-   
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/TypeVisitor.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/TypeVisitor.java
deleted file mode 100644
index d254615..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/TypeVisitor.java
+++ /dev/null
@@ -1,38 +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.consumption.codegen.bean;
-
-import org.eclipse.jst.ws.internal.consumption.codegen.RelVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeElement;
-
-
-/**
-* Objects of this class represent a visitor.
-* */
-public class TypeVisitor extends RelVisitor
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  /**
-  * Constructor.
-  * 
-  */
-
-  public TypeVisitor ()
-  {
-    super(TypeElement.REL_TYPE);
-  }
-  
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/DetectNonJavaCharsBeanVisitorAction.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/DetectNonJavaCharsBeanVisitorAction.java
deleted file mode 100644
index 9901a73..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/DetectNonJavaCharsBeanVisitorAction.java
+++ /dev/null
@@ -1,94 +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.consumption.codegen.javamofvisitoractions;
-
-import java.util.Vector;
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors.JavaMofMethodVisitor;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-
-
-
-
-/**
-* Objects of this class represent a JavaMofBeanVisitorAction.
-* This VisitorAction will create a BeanElement using the
-* JavaClass and the BeanModelElementsFactory
-* It will also automatically walk the methods in the JavaClass
-* */
-public class DetectNonJavaCharsBeanVisitorAction extends VisitorActionImpl
-{
-  private static char UNDERSCORE = '_';
-  private boolean serviceBean = false;
-
-  public DetectNonJavaCharsBeanVisitorAction ( Vector messages, Vector beans)
-  	{
-  		super (messages, beans);
-  		// if first bean fisited that means it is the Service bean
-  		if ( beans == null ) 
-  			serviceBean = true;
-  	}
-
-  /**
-  * The visit will create the bean
-  * Walk the methods
-  * @param JavaClass the class to be used to create the bean model
-  **/
-  public Status visit (Object javaclass)
-  {
-    JavaClass javaClass = (JavaClass)javaclass;
-    String packageName = javaClass.getJavaPackage().getPackageName();
-    String beanName = javaClass.getName();
-
-    if (!isBeanVisited(javaClass)) {
-      	addVisitedBean(javaClass);
-		// check the bean name
-		checkBeanName(beanName);
-		checkPackageName(packageName, beanName);
-	  	DetectNonJavaCharsMethodVisitorAction methodVisitorAction = new DetectNonJavaCharsMethodVisitorAction(getMessages(), getBeansVisited());
-      	JavaMofMethodVisitor methodVisitor = new JavaMofMethodVisitor();
-    	methodVisitor.run(javaClass,methodVisitorAction);
-     }
-    
-    return new SimpleStatus("");
-   }
-
-   private void checkBeanName(String beanName)
-   	{
-	 
-	 // check if the bean starts with a lower case
-	 if ( Character.isLowerCase(beanName.charAt(0)))
-    	addMessage("WARN_BEAN_NAME_STARTS_WITH_LOWER_CASE", new String[]{beanName});  
-
-	
-     //check if the name has an underscore, then next letter should be upper case
-     int underScoreIndex = beanName.indexOf(UNDERSCORE);
-	 String tempName = beanName;
-	 while(underScoreIndex !=-1) {
-		tempName = tempName.substring(underScoreIndex+1);
-		if ( Character.isLowerCase(tempName.charAt(0))) {
-      		addMessage("MSG_WARN_METHOD_NAME_INVALID", new String[] { beanName });  
-      		break;
-			}
-		else
-			underScoreIndex = tempName.indexOf(UNDERSCORE);
-		}
-	}
-
-	private void checkPackageName(String packageName, String beanName)
-		{
-			if (!packageName.equals(packageName.toLowerCase()))
-				addMessage("MSG_WARN_PACKAGE_NAME_HAS_UPPER_CASE", new String[] { packageName, beanName });
-		}
- }
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/DetectNonJavaCharsMethodVisitorAction.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/DetectNonJavaCharsMethodVisitorAction.java
deleted file mode 100644
index b9e6680..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/DetectNonJavaCharsMethodVisitorAction.java
+++ /dev/null
@@ -1,116 +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.consumption.codegen.javamofvisitoractions;
-
-import java.util.Vector;
-
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors.JavaMofParameterVisitor;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-
-
-/**
-* Objects of this class represent a JavaMofBeanVisitorAction.
-* This VisitorAction will create a BeanElement using the 
-* JavaClass and the BeanModelElementsFactory
-* It will also automatically walk the methods in the JavaClass
-* */
-public class DetectNonJavaCharsMethodVisitorAction extends VisitorActionImpl 
-{
-  private static char UNDERSCORE = '_';
-  private boolean serviceBean = false;
-
-   public DetectNonJavaCharsMethodVisitorAction ( Vector messages, Vector beans)
-  	{
-  		super (messages, beans);
-  		if ( beans.size() == 1)
-  			serviceBean = true;
-  	}
-
-  /**
-  * Create a method element from the method 
-  * @param Method the class to be used to create the method
-  **/
-  public Status visit (Object imethod)
-  {
-    
-    Method method = (Method)imethod;
-    String  className = method.getContainingJavaClass().getName();
-    String name = method.getName();
-
-	if ( serviceBean && !method.isConstructor() )
-		checkUpperCase(name, className);
-	
-	// for service bean or any referenced bean property accessors
-	 if ( serviceBean || name.startsWith("get") || name.startsWith("set") || name.startsWith("is")) 
-	 {
-	    checkUnderScore(name, className);
-	    checkNumericDigits(name, className);
-	    checkBooleanProperties(method, className);
-		  	
-	 	DetectNonJavaCharsParameterVisitorAction parameterVisitorAction = new DetectNonJavaCharsParameterVisitorAction(getMessages(), getBeansVisited());
-	 	// rsk Passing in null for the environment. DetectNonJavaCharsParameterVisitorAction always returns an OK status.
-    	JavaMofParameterVisitor parameterVisitor = new JavaMofParameterVisitor(null);
-    	parameterVisitor.run(method, parameterVisitorAction);   
-	  }
-	 
-	 return new SimpleStatus("");
-	}
-
-  private void checkUpperCase(String name, String className)
-  {
-  	 // in a service bean check if any method starts with upper case letter
-	 if ( Character.isUpperCase(name.charAt(0)))
-    		addMessage("MSG_WARN_JAVA_METHOD_START_WITH_UPPER_CASE", new String[]{name, className});  
-
-  }
-
-  private void checkUnderScore(String name, String className)
-  {
-     //check if the name has an underscore, then next letter should be upper case
-     int underScoreIndex = name.indexOf(UNDERSCORE);
-	 String tempName = name;
-	 while(underScoreIndex !=-1) {
-		tempName = tempName.substring(underScoreIndex+1);
-		if ( Character.isLowerCase(tempName.charAt(0))) {
-    		addMessage("MSG_WARN_METHOD_NAME_INVALID", new String[]{name, className});  
-     		break;
-		}
-		else
-			underScoreIndex = tempName.indexOf(UNDERSCORE);
-	   }
-  }
-
-  private void checkNumericDigits(String name, String className)
-  {
-     //check if the name has a numeric, then next letter should be upper case
-     for ( int i = 0; i < name.length(); i++)
-     	{
-     		if ( Character.isDigit(name.charAt(i)))
-     			{
-     				if (Character.isLowerCase(name.charAt(i+1))) {
-			    		addMessage("MSG_WARN_METHOD_NAME_INVALID", new String[]{name, className});  
-			     		break;
- 					}
-		}
-     }
-  }
-  private void checkBooleanProperties(Method method, String className)
-  	{
-  		if (!serviceBean && method.getName().startsWith("get") && 
-  			(method.getReturnType().getName().equals("boolean") ||
-  			 method.getReturnType().getName().equals("java.lang.Boolean")))
-  			addMessage("MSG_WARN_BOOLEAN_PROPERTY_ACCESSORS", new String[]{method.getName(), className});  
-  	}
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/DetectNonJavaCharsParameterVisitorAction.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/DetectNonJavaCharsParameterVisitorAction.java
deleted file mode 100644
index d21bf1e..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/DetectNonJavaCharsParameterVisitorAction.java
+++ /dev/null
@@ -1,87 +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.consumption.codegen.javamofvisitoractions;
-
-import java.util.Vector;
-
-import org.eclipse.jem.java.ArrayType;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.JavaParameter;
-import org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors.JavaMofBeanVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeFactory;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-
-
-
-/**
-* Objects of this class represent a JavaMofBeanVisitorAction.
-* This VisitorAction will create a BeanElement using the 
-* JavaClass and the BeanModelElementsFactory
-* It will also automatically walk the methods in the JavaClass
-* */
-public class DetectNonJavaCharsParameterVisitorAction extends VisitorActionImpl 
-{
-
-  public DetectNonJavaCharsParameterVisitorAction ( Vector messages, Vector beans)
-  	{
-  		super (messages, beans);
-  	}
-
-  /**
-  * Create a method element from the method 
-  * @param Method the class to be used to create the method
-  **/
-  public Status visit (Object ijavaParameter)
-  {
-    
-    JavaParameter javaParameter = (JavaParameter) ijavaParameter;
-    JavaClass javaClass = null;
-    if ( javaParameter.getJavaType() instanceof JavaClass) 
-    	{
-    	javaClass = (JavaClass) javaParameter.getJavaType();
-    	if (javaClass.isArray())
-    	  {
-    	    JavaHelpers componentType = ((ArrayType)javaClass).getComponentTypeAsHelper();
-    	    if (componentType instanceof JavaClass)
-    	      {
-    	        javaClass = (JavaClass)componentType;
-    	      }
-    	    else
-    	      {
-    	        javaClass = null; //The array contains primitive types, there is no need for further checking.
-    	      }
-    	  }
-    	}
-   	if (toBeVisited(javaClass))    {
-			DetectNonJavaCharsBeanVisitorAction beanVisitorAction = new DetectNonJavaCharsBeanVisitorAction(getMessages(), getBeansVisited());
-			JavaMofBeanVisitor beanVisitor = new JavaMofBeanVisitor();
-			beanVisitor.run(javaClass,beanVisitorAction);
-  	  	}
-   	
-   	return new SimpleStatus("");
-  }
-  
-
-  private boolean toBeVisited (JavaClass javaClass)
-  {
-	//check for recognized types 
-	if( javaClass == null	||
-	   javaClass.isPrimitive() ||
-	   javaClass.getJavaName().startsWith("javax") ||
-       TypeFactory.recognizedBean(javaClass.getJavaName()))
-	    	return false;
-	else
-		  	return true;
-	}
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofAttributeVisitorAction.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofAttributeVisitorAction.java
deleted file mode 100644
index f3e37d5..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofAttributeVisitorAction.java
+++ /dev/null
@@ -1,145 +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.consumption.codegen.javamofvisitoractions;
-
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.JavaParameter;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors.JavaMofTypeVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.AttributeElement;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.BeanModelElementsFactory;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeFactory;
-import org.eclipse.jst.ws.internal.consumption.sampleapp.common.SamplePropertyDescriptor;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.Log;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.command.env.core.common.StatusException;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-
-
-/**
-* Objects of this class represent a JavaMofBeanVisitorAction.
-* This VisitorAction will create a AttributeElement using the
-* JavaClass and the BeanModelElementsFactory
-* It will also automatically walk a complex type
-* */
-public class JavaMofAttributeVisitorAction extends JavaMofBeanVisitorAction
-{
-	
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-  private MessageUtils msgUtils_;
-
-  /*
-  *Constructor
-  **/
-  public JavaMofAttributeVisitorAction(Element parentElement, String project, Environment env)
-  {
-    super(parentElement,project, env);
-	String pluginId = "org.eclipse.jst.ws.consumption";
-	msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-  }
-
-  /**
-  * Create a type element from the JavaHelper
-  * @param JavaParameter the mof element to be used to create the attribute
-  **/
-
-
-  //bean info code
-
-
-  public Status visit (Object propertyDecorator)
-  {
-  	Status status = new SimpleStatus("");
-  	  	
-    //PropertyDecorator pd = (PropertyDecorator)propertyDecorator;
-    SamplePropertyDescriptor pd = (SamplePropertyDescriptor)propertyDecorator;  
-    
-    
-    try{
-       //if the type of this attribute is unsupported dont make an Attribute
-      if(!(getReturnParam() && TypeFactory.isRecognizedReturnType((JavaHelpers)pd.getPropertyType())) 
-      	&& (TypeFactory.isUnSupportedType((JavaHelpers)pd.getPropertyType()))){
-      	  status = new SimpleStatus("", msgUtils_.getMessage("MSG_WARN_JTS_UNSUPPORTED_TYPE") + ((JavaHelpers)pd.getPropertyType()).getJavaName(), Status.WARNING );
-	      //getStatusMonitor().reportStatus( new Status(IStatus.WARNING,WebServiceConsumptionPlugin.ID,0,
-	      //WebServiceConsumptionPlugin.getMessage( "%MSG_WARN_JTS_UNSUPPORTED_TYPE") + ((JavaHelpers)pd.getPropertyType()).getJavaName(),null));
-	      return status;
-	  }	
-
-      Method setMethod = pd.getWriteMethod();
-      Method getMethod = pd.getReadMethod();
-      if(setMethod != null){
-      	if(setMethod.isStatic()){
-          setMethod=null; 
-      	}
-      }
-      if(getMethod != null){
-      	if(getMethod.isStatic()){
-          getMethod=null;
-      	}
-      }
-      if(pd.isfStatic()){
-        return status;
-      }
-      
-      AttributeElement attributeElement = (AttributeElement)BeanModelElementsFactory.getBeanModelElement(propertyDecorator,fParentElement);
-
-      if(attributeElement != null){
-        
-        //lets check and see if the getter takes input params
-        //if so throw an error
-        //now the inputs
-        if(getMethod != null){
-	      JavaParameter javaParameter[] = getMethod.listParametersWithoutReturn();
-	        if(javaParameter.length > 0){
-	          if(getReturnParam()) return status;
-	          status = new SimpleStatus("", msgUtils_.getMessage("MSG_WARN_JTS_UNSUPPORTED_INDEXED_PROPERTIES") + getMethod.getName(), Status.WARNING );
-	          //getStatusMonitor().reportStatus (new Status(IStatus.WARNING,WebServiceConsumptionPlugin.ID,0,
-	          //		WebServiceConsumptionPlugin.getMessage( "%MSG_WARN_JTS_UNSUPPORTED_INDEXED_PROPERTIES" ) + getMethod.getName(),null));
-	          return status;
-	        }
-        }
-        if(setMethod != null) attributeElement.setSetterMethod(setMethod.getMethodElementSignature());
-        if(getMethod != null) attributeElement.setGetterMethod(getMethod.getMethodElementSignature());
-
-        JavaMofTypeVisitorAction typeVisitorAction = new JavaMofTypeVisitorAction(attributeElement,clientProject, env_);
-        typeVisitorAction.setStatusMonitor(getStatusMonitor());
-        typeVisitorAction.setBeansCreated(getBeansCreated());
-        typeVisitorAction.setReturnParam(getReturnParam()); 
-        JavaMofTypeVisitor typeVisitor = new JavaMofTypeVisitor(env_);
-        typeVisitor.setClientProject(getProject());
-        status = typeVisitor.run(pd,typeVisitorAction);
-       
-      }
-    
-      return status;
-    }catch(Exception e)
-    {
-    	env_.getLog().log(Log.WARNING, 5054, this, "visit", e);
-    	status = new SimpleStatus("JavaMofAttributeVisitorAction", //$NON-NLS-1$
-    			msgUtils_.getMessage("MSG_ERROR_JTS_JSP_GEN"), Status.WARNING, e);
-    	try {
-			env_.getStatusHandler().report(status);
-		} catch (StatusException e1) {
-			status = new SimpleStatus("JavaMofAttributeVisitorAction", //$NON-NLS-1$
-	    			msgUtils_.getMessage("MSG_ERROR_JTS_JSP_GEN"), Status.ERROR);
-		}
-    	return status;
-    }
-    //env.Log.write(this,"visit",Log.OK,e);}
-
-  }
- 
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofBeanVisitorAction.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofBeanVisitorAction.java
deleted file mode 100644
index 0fb01fb..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofBeanVisitorAction.java
+++ /dev/null
@@ -1,436 +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.consumption.codegen.javamofvisitoractions;
-
-import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.Vector;
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaParameter;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.ws.internal.command.NullStatusMonitor;
-import org.eclipse.jst.ws.internal.command.StatusMonitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.Visitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.VisitorAction;
-import org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors.JavaMofAttributeVisitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors.JavaMofFieldVisitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors.JavaMofMethodVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.BeanElement;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.BeanModelElementsFactory;
-import org.eclipse.wst.command.env.core.common.Choice;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.command.env.core.selection.BooleanSelection;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-
-/**
-* Objects of this class represent a JavaMofBeanVisitorAction.
-* This VisitorAction will create a BeanElement using the
-* JavaClass and the BeanModelElementsFactory
-* It will also automatically walk the methods in the JavaClass
-* */
-public class JavaMofBeanVisitorAction implements VisitorAction
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  private MessageUtils msgUtils_;
-  protected Environment env_;
- // protected BeanElement fBeanElement;
-
-  protected Visitor fVisitor;
-
-  /*
-  * The project that defines the context
-  **/
-  protected String clientProject;
-
-  /*
-  * The Status monitor
-  **/
-  protected StatusMonitor monitor_;
-
-  /*
-  * The model that will be created
-  **/
-  protected Model fModel;
-
-  /*
-  * This is the parent element used when creating a
-  * new element
-  */
-  protected Element fParentElement;
-
-  /*
-  * Methods processed from proxy
-  */
-  protected Vector fBeansCreated;
-
-  private BooleanSelection[] fMethodsSelected;
-
-  /*
-  * this boolean tells wether the bean is a return parameter or an input parameter
-  * usually this should be set around the parametervisitoraction, and passed on from there
-  */
-  protected boolean fReturnParam=false;
-
-  public JavaMofBeanVisitorAction(String clientProject,BooleanSelection[] methods, Environment env)
-  {
-    this.clientProject = clientProject;
-    fMethodsSelected = methods;
-	String pluginId = "org.eclipse.jst.ws.consumption";
-	msgUtils_ = new MessageUtils(pluginId + ".plugin", this); 
-	env_ = env;
-  }
-
-
-
-  /*
-  *Constructor
-  * @param Model model is the Model that this bean will be placed in
-  * @param IProject used in nature
-  **/
-  public JavaMofBeanVisitorAction(Model model, String clientProject, Environment env)
-  {
-    this.clientProject = clientProject;
-    fModel = model;
-    String pluginId = "org.eclipse.jst.ws.consumption";
-	msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-	env_ = env;
-  }
-
-  /*
-  *Constructor
-  * @param Element the parent element that this element will be added too
-  * @param IProject used in nature
-  **/
-  public JavaMofBeanVisitorAction(Element parentElement, String clientProject, Environment env )
-  {
-    fParentElement = parentElement;
-    this.clientProject = clientProject;
-    String pluginId = "org.eclipse.jst.ws.consumption";
-	msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-	env_ = env;
-  }
-
-  /**
-  * The visit will create the bean
-  * Walk the methods
-  * @param JavaClass the class to be used to create the bean model
-  **/
-  public Status visit (Object javaclass)
-  {
-  	Choice OKChoice = new Choice('O', msgUtils_.getMessage("LABEL_OK"), msgUtils_.getMessage("DESCRIPTION_OK"));
-  	Choice CancelChoice = new Choice('C', msgUtils_.getMessage("LABEL_CANCEL"), msgUtils_.getMessage("DESCRIPTION_CANCEL"));
-  	Status status = new SimpleStatus("");
-    JavaClass javaClass = (JavaClass)javaclass;
-    
-    
-    BeanElement beanElement = (BeanElement)BeanModelElementsFactory.getBeanModelElement(javaClass,fParentElement,fModel);
-    if(beanElement.isOwnerParameter()) {
-        resetBeansCreated();
-    }
-    fModel = beanElement.getModel();
-
-    //this for the subsequent beans that represent types
-    //first do the attributes
-    //if we are not on the root
-    if (!(beanElement == fModel.getRootElement())){
-       Enumeration e = getBeansCreated().elements();
-       while(e.hasMoreElements()){
-          String name = (String)e.nextElement();
-          if(name.equals(javaClass.getName())){
-          	status = new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_JTS_CYCLIC_BEAN"), Status.WARNING);
-            //getStatusMonitor().reportStatus(new Status(IStatus.WARNING,WebServiceConsumptionPlugin.ID,0,
-            			//WebServiceConsumptionPlugin.getMessage( "%MSG_ERROR_JTS_CYCLIC_BEAN" ),null));
-            return status;
-          }
-       }
-       
-       JavaMofAttributeVisitorAction attributeVisitorAction = new JavaMofAttributeVisitorAction(beanElement,clientProject, env_);
-       //attributeVisitorAction.setStatusMonitor(getStatusMonitor());
-       Vector childVector = ((Vector)getBeansCreated().clone());
-       childVector.addElement(javaClass.getName());  
-       attributeVisitorAction.setBeansCreated(childVector);
-       attributeVisitorAction.setReturnParam(getReturnParam());
-       JavaMofAttributeVisitor attributeVisitor = new JavaMofAttributeVisitor();
-       attributeVisitor.setReturnParameter(getReturnParam());
-       attributeVisitor.setProject(getProject());
-       attributeVisitor.setEnvironment(env_);
-       status = attributeVisitor.run(javaClass,attributeVisitorAction);
-       //
-       int severity = status.getSeverity(); 
-       if (severity==Status.ERROR)
-       	return status;
-       
-       if (severity==Status.WARNING)
-       {
-         Choice result = env_.getStatusHandler().report(status, new Choice[]{OKChoice, CancelChoice});
-         if (result.getLabel().equals(CancelChoice.getLabel()))
-         {
-         	 //return an error status since the user canceled
-         	  return new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_SAMPLE_CREATION_CANCELED"), Status.ERROR);
-         }
-         	
-       }
-       //                           
-
-       JavaMofFieldVisitorAction fieldVisitorAction = new JavaMofFieldVisitorAction(beanElement,clientProject, env_);
-       //fieldVisitorAction.setStatusMonitor(getStatusMonitor());
-       Vector childVector2 = ((Vector)getBeansCreated().clone());
-       childVector2.addElement(javaClass.getName());  
-       fieldVisitorAction.setBeansCreated(childVector2);
-       fieldVisitorAction.setReturnParam(getReturnParam());
-       JavaMofFieldVisitor fieldVisitor = new JavaMofFieldVisitor();
-       fieldVisitor.setProject(getProject());
-       status = fieldVisitor.run(javaClass,fieldVisitorAction);
-       //
-       severity = status.getSeverity(); 
-       if (severity==Status.ERROR)
-       	return status;
-       
-       if (severity==Status.WARNING)
-       {
-         Choice result = env_.getStatusHandler().report(status, new Choice[]{OKChoice, CancelChoice});
-         if (result.getLabel().equals(CancelChoice.getLabel()))
-         {
-         	 //return an error status since the user canceled
-         	  return new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_SAMPLE_CREATION_CANCELED"), Status.ERROR);
-         }
-         	
-       }
-       //       
-       
-   }
-
-    //this is to insure we are on the proxy
-    //now do the methods
-    if (beanElement == fModel.getRootElement()){
-      //first lets make sure the proxy is in good form
-      //-it has a default constructor
-      //-it has at least one method
-      //otherwise return the problem in the form of a status
-
-      if (!proxyCheck(javaClass, status)) return status;
-      JavaMofMethodVisitorAction methodVisitorAction = new JavaMofMethodVisitorAction(beanElement,clientProject, env_);
-      
-      //methodVisitorAction.setStatusMonitor(getStatusMonitor());
-      JavaMofMethodVisitor methodVisitor = new JavaMofMethodVisitor();
-      methodVisitor.setMethodSelection(fMethodsSelected);
-      status = methodVisitor.run(javaClass,methodVisitorAction);
-
-      //
-      int severity = status.getSeverity(); 
-      if (severity==Status.ERROR)
-      	return status;
-      
-      if (severity==Status.WARNING)
-      {
-        Choice result = env_.getStatusHandler().report(status, new Choice[]{OKChoice, CancelChoice});
-        if (result.getLabel().equals(CancelChoice.getLabel()))
-        {
-        	 //return an error status since the user canceled
-        	  return new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_SAMPLE_CREATION_CANCELED"), Status.ERROR);
-        }
-        	
-      }
-      //                      
-      //This is where we check for several things:
-      //-if no methods were processed because of unsupported types then we send back that result
-      //-if there were any methods omitted we should warn them
-
-      //first no methods
-      if (!methodVisitorAction.wereMethodsProcessed()){
-        //this has to be done to insure the dialog is an error
-      	status = new SimpleStatus("",msgUtils_.getMessage("MSG_ERROR_JTS_NO_PROXY_METHODS_PROCESSED"), Status.ERROR);
-      	return status;
-        //getStatusMonitor().reportStatus( new Status(IStatus.ERROR,WebServiceConsumptionPlugin.ID,0,
-        //		WebServiceConsumptionPlugin.getMessage( "%MSG_ERROR_JTS_NO_PROXY_METHODS_PROCESSED" ),null));
-      }        	
-      //now methods omitted
-      else if(methodVisitorAction.wereMethodsOmitted()){
-        //The dialog is already a warning so we just need to set the overall message
-      	status = new SimpleStatus("",msgUtils_.getMessage("MSG_WARN_JTS_PROXY_METHODS_OMITTED"), Status.WARNING);
-      	return status;
-        //getStatusMonitor().reportStatus( new Status(IStatus.WARNING,WebServiceConsumptionPlugin.ID,0,
-        //		WebServiceConsumptionPlugin.getMessage( "%MSG_WARN_JTS_PROXY_METHODS_OMITTED" ),null));
-      }	
-    }
-    return status;
-  }
-
-  public void initialize(String resident)
-  {
-    //nothing to be done but must be implemented
-  }
-
-
-  /*
-  * Return the model that was created
-  * @return Model the bean model that was created
-  */
-  public Model getModel()
-  {
-    return fModel;
-  }
-
-  /*
-  * The proxy check insures there is a default constructor and
-  * at Least one method
-  * @param JavaClass javaClass is used to traverse the methods on the proxy
-  */
-  public boolean proxyCheck(JavaClass javaClass, Status status)
-  {
-     // first check for a method
-     Iterator m=javaClass.getPublicMethods().iterator();
-     if (!m.hasNext()){
-     	status = new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_JTS_PROXY_HAS_NO_METHODS"),Status.ERROR);
-       //getStatusMonitor().reportStatus( new Status(IStatus.ERROR,WebServiceConsumptionPlugin.ID,0,
-       //			WebServiceConsumptionPlugin.getMessage( "%MSG_ERROR_JTS_PROXY_HAS_NO_METHODS" ),null));
-       return false;
-     }	
-     //now check for a default constructor
-     while (m.hasNext()) {
-       Method method=(Method)m.next();
-       if (javaClass.getName().equals(method.getName())){
-          //now the inputs
-          JavaParameter javaParameter[] = method.listParametersWithoutReturn();
-          if (javaParameter.length > 0){
-             //then we have no default constructor
-          	 status = new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_JTS_PROXY_HAS_NO_DEFAULT"),Status.ERROR);
-             //getStatusMonitor().reportStatus( new Status(IStatus.ERROR,WebServiceConsumptionPlugin.ID,0,
-             		//WebServiceConsumptionPlugin.getMessage( "%MSG_ERROR_JTS_PROXY_HAS_NO_DEFAULT" ),null));
-             return false;
-          }
-       }
-    }
-    return true;
-
-  }
-
- /**
-  * Sets the status monitor that this action will use to report status that occres while executing the Action.
-  */
-  public void setStatusMonitor ( StatusMonitor monitor )
-  {
-	monitor_ = monitor;
-  }
-
-  /**
-  * Returns the status monitor that this task is using to report status.
-  */
-  public StatusMonitor getStatusMonitor ()
-  {
-    if (monitor_ == null)
-    {
-      monitor_ = new NullStatusMonitor();
-    }
-    return monitor_;
-  }
-
-
-   /**
-  * check if the action has finished sucsessfully 
-  */
-  /*
-  public boolean isSuccessful ()
-  {
-   	return getStatusMonitor().canContinue();
-  }
-  */ 
-  public void resetBeansCreated()
-  {
-    fBeansCreated = new Vector();
-  }
-
-  public void setEnvironment(Environment env)
-  {
-  	env_ = env;
-  }
-  
-  /*
-  * The command that called this will get the results of the operation in the form
-  * of a status.
-  */
-  public Vector getBeansCreated ()
-  {
-    if(fBeansCreated == null) fBeansCreated = new Vector();
-    return fBeansCreated;
-  }
-
-  /*
-  * The command that called this will get the results of the operation in the form
-  * of a status.
-  */
-  public void setBeansCreated (Vector beansCreated)
-  {
-    fBeansCreated = beansCreated;
-  }
-
-   /*
-  * This boolean tells wether we are dealing with a return param 
-  */
-  public boolean getReturnParam ()
-  {
-    return fReturnParam;
-  }
-
-  /*
-  * This boolean tells wether we are dealing with a return param 
-  */
-  public void setReturnParam (boolean returnparam)
-  {
-    fReturnParam = returnparam;
-  }
-
-   /*
-  * This boolean tells wether we are dealing with a return param 
-  */
-  public String getProject ()
-  {
-    return clientProject;
-  }
-
-  /*
-  * This boolean tells wether we are dealing with a return param 
-  */
-  public void setProject (String clientProject)
-  {
-    this.clientProject = clientProject;
-  }
-
-
-  /**
-  * sets the visitor that calls the visit
-  * @parameter Visitor
-  */
-
-  public void setVisitor(Visitor visitor)
-  {
-      fVisitor = visitor;
-  }
-
-  /*
-  * Sets the parent element the child then knows where to
-  * add itself to the model
-  * @param Element parent element
-  */
-  public void setParentElement(Element element)
-  {
-    fParentElement = element;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofFieldVisitorAction.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofFieldVisitorAction.java
deleted file mode 100644
index 398d6f0..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofFieldVisitorAction.java
+++ /dev/null
@@ -1,112 +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.consumption.codegen.javamofvisitoractions;
-
-import org.eclipse.jem.java.Field;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors.JavaMofTypeVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.BeanModelElementsFactory;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.FieldElement;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeFactory;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.Log;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.command.env.core.common.StatusException;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-
-
-/**
-* Objects of this class represent a JavaMofBeanVisitorAction.
-* This VisitorAction will create a AttributeElement using the
-* JavaClass and the BeanModelElementsFactory
-* It will also automatically walk a complex type
-* */
-public class JavaMofFieldVisitorAction extends JavaMofBeanVisitorAction
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-  private MessageUtils msgUtils_;
-
-
-  /*
-  *Constructor
-  **/
-  public JavaMofFieldVisitorAction(Element parentElement, String project, Environment env)
-  {
-    super(parentElement,project, env);
-    String pluginId = "org.eclipse.jst.ws.consumption";
-    msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-  }
-
-  /**
-  * Create a type element from the JavaHelper
-  * @param JavaParameter the mof element to be used to create the attribute
-  **/
-
-
-  //bean info code
-
-
-  public Status visit (Object field_)
-  {
-  	Status status = new SimpleStatus("");
-    Field field = (Field)field_;
-     
-    try{
-       //if the type of this attribute is unsupported dont make an Attribute
-      if(!(getReturnParam() && TypeFactory.isRecognizedReturnType((JavaHelpers)field.getJavaClass())) 
-      	&& (TypeFactory.isUnSupportedType((JavaHelpers)field.getJavaClass()))){
-      	  status = new SimpleStatus("", msgUtils_.getMessage("MSG_WARN_JTS_UNSUPPORTED_TYPE") + ((JavaHelpers)field.getJavaClass()).getJavaName(), Status.WARNING );
-	      //getStatusMonitor().reportStatus( new Status(IStatus.WARNING,WebServiceConsumptionPlugin.ID,0,
-	      //WebServiceConsumptionPlugin.getMessage( "%MSG_WARN_JTS_UNSUPPORTED_TYPE") + ((JavaHelpers)field.getJavaClass()).getJavaName(),null));
-	      return status;
-	  }	
-
-
-      FieldElement fieldElement = (FieldElement)BeanModelElementsFactory.getBeanModelElement(field,fParentElement);
-
-      if(fieldElement != null){
-        //lets check and see if the getter takes input params
-        //if so throw an error
-        //now the inputs
-        
-        JavaMofTypeVisitorAction typeVisitorAction = new JavaMofTypeVisitorAction(fieldElement,clientProject, env_);
-        typeVisitorAction.setStatusMonitor(getStatusMonitor());
-        typeVisitorAction.setBeansCreated(getBeansCreated());
-        typeVisitorAction.setReturnParam(getReturnParam()); 
-        JavaMofTypeVisitor typeVisitor = new JavaMofTypeVisitor(env_);
-        typeVisitor.setClientProject(getProject());
-        status = typeVisitor.run(field,typeVisitorAction);
-       
-      }
-      return status;
-    
-    }catch(Exception e)
-	{
-    	env_.getLog().log(Log.WARNING, 5055, this, "visit", e);
-    	status = new SimpleStatus("JavaMofFieldVisitorAction", //$NON-NLS-1$
-    			msgUtils_.getMessage("MSG_ERROR_JTS_JSP_GEN"), Status.WARNING, e);
-    	try {
-    		env_.getStatusHandler().report(status);
-    	} catch (StatusException e1) {
-    		status = new SimpleStatus("JavaMofFieldVisitorAction", //$NON-NLS-1$
-    				msgUtils_.getMessage("MSG_ERROR_JTS_JSP_GEN"), Status.ERROR);
-    	}
-    	return status;
-	}
-
-  }
- 
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofMethodVisitorAction.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofMethodVisitorAction.java
deleted file mode 100644
index 6a9faeb..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofMethodVisitorAction.java
+++ /dev/null
@@ -1,226 +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.consumption.codegen.javamofvisitoractions;
-
-import java.util.Iterator;
-import java.util.Vector;
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.JavaParameter;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors.JavaMofParameterVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.BeanModelElementsFactory;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.MethodElement;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeFactory;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-
-
-/**
-* Objects of this class represent a JavaMofBeanVisitorAction.
-* This VisitorAction will create a BeanElement using the 
-* JavaClass and the BeanModelElementsFactory
-* It will also automatically walk the methods in the JavaClass
-* */
-public class JavaMofMethodVisitorAction extends JavaMofBeanVisitorAction 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  private MessageUtils msgUtils_;
-  public String fUnsupportedParameterName;
-
- /*
-  * Methods omitted from the proxy
-  */
-  protected Vector fMethodsOmitted;
-
-  /*
-  * Methods processed from proxy
-  */
-  protected Vector fMethodsProcessed;
-
-     
-  /*
-  *Constructor
-  **/
-  public JavaMofMethodVisitorAction(Element parentElement,String project, Environment env)
-  {
-    super(parentElement,project, env);
-    String pluginId = "org.eclipse.jst.ws.consumption";
-	msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-    fMethodsOmitted = new Vector();
-    fMethodsProcessed = new Vector();
-
-  }
-   
-  /**
-  * Create a method element from the method 
-  * @param Method the class to be used to create the method
-  **/
-  public Status visit (Object imethod)
-  {
-  	Status status = new SimpleStatus("");
-    Method method = (Method)imethod;
-           
-    if (methodCheck(method)){
-      //this is to check immediate input and return parameters
-      //if there is an unsupported type in these we can react immediately
-      //we add it to the omitted methods an go to the next one
-      if(!parameterCheck(method)){
-      	status = new SimpleStatus("", msgUtils_.getMessage("MSG_WARN_JTS_UNSUPPORTED_PARAMETERS_ARRAYS") + fUnsupportedParameterName, Status.WARNING );
-        //getStatusMonitor().reportStatus (new Status(IStatus.WARNING,WebServiceConsumptionPlugin.ID,0,
-        //		WebServiceConsumptionPlugin.getMessage( "%MSG_WARN_JTS_UNSUPPORTED_PARAMETERS_ARRAYS" ) + fUnsupportedParameterName,null));
-        fMethodsOmitted.addElement(method.getMethodElementSignature());
-        return status;
-      }
-      if(!nullConstructor(method)){
-      	status = new SimpleStatus("", msgUtils_.getMessage("MSG_WARN_JTS_UNSUPPORTED_PARAMETERS_INPUTS") + fUnsupportedParameterName, Status.WARNING );
-        //getStatusMonitor().reportStatus (new Status(IStatus.WARNING,WebServiceConsumptionPlugin.ID,0,
-       	//	WebServiceConsumptionPlugin.getMessage( "%MSG_WARN_JTS_UNSUPPORTED_PARAMETERS_INPUTS" ) + fUnsupportedParameterName,null));
-        fMethodsOmitted.addElement(method.getMethodElementSignature());
-        return status;
-      
-      }
-
-      //carry on all parameters supported
-      MethodElement methodElement = (MethodElement)BeanModelElementsFactory.getBeanModelElement(method,fParentElement);
-      JavaMofParameterVisitorAction parameterVisitorAction = new JavaMofParameterVisitorAction(methodElement,clientProject,env_);
-      parameterVisitorAction.setStatusMonitor(getStatusMonitor());
-      JavaMofParameterVisitor parameterVisitor = new JavaMofParameterVisitor(env_);
-      status = parameterVisitor.run(method,parameterVisitorAction);   
-      //something may have gone wrong with an internal type
-      if (status.getSeverity()!=Status.OK){
-        //This method has to be omitted
-        fMethodsOmitted.addElement(method.getMethodElementSignature());
-        methodElement.setMethodOmmission(true);  
-      }	
-      else {
-        fMethodsProcessed.addElement(method.getMethodElementSignature());
-      }	
-    }
-    
-    return status;
-  }
- 
-  /*
-  * Tells wether any methods were processed 
-  * @return boolean true if any methods were processed 
-  */
-  public boolean wereMethodsProcessed()
-  {
-    if(fMethodsProcessed.isEmpty()) return false;
-    return true;
-  }
-
-  /*
-  * Tells wether there were methods omitted because of unsupported types
-  * @return boolean true if methods were omitted
-  */
-  public boolean wereMethodsOmitted()
-  {
-    if(fMethodsOmitted.isEmpty()) return false;
-    return true;
-  }
-  
-  /**
-  * There may be methods that we dont support
-  * and dont want in the model
-  * @param boolean true if all parameters are fine
-  **/
-  public boolean methodCheck(Method method)
-  {
-    boolean ok = true;
-    // if we have a constructor we return false
-    if (method.isConstructor()) return false;
-
-       
-    return ok;
-  }
-
-  /**
-  * There may be parameters of this method that have types
-  * not yet supported return false if we find any
-  * @param boolean true if all parameters are fine
-  **/
-  public boolean parameterCheck(Method method)
-  {
-
-    boolean ok = true;
-    
-    //now the inputs
-    JavaParameter javaParameter[] = method.listParametersWithoutReturn(); 
-    boolean paramSupported = true;
-    for (int i = 0;i<javaParameter.length;i++) {
-      JavaParameter param=javaParameter[i];
-      JavaHelpers javaHelper1 = param.getJavaType();
-      if(TypeFactory.isUnSupportedType(javaHelper1)) {
-        fUnsupportedParameterName = param.getName(); 
-    	return false;
-      }    
-    }
-  return ok;
-  }
-
- 
-  /**
-  * There may be parameters of this method that have types
-  * not yet supported return false if we find any
-  * @param boolean true if all parameters are fine
-  **/
-  public boolean nullConstructor(Method method)
-  {
-    
-    boolean ok = true;
-    //now the inputs
-    JavaParameter javaParameter[] = method.listParametersWithoutReturn(); 
-    boolean paramSupported = true;
-    for (int i = 0;i<javaParameter.length;i++) {
-      JavaParameter param=javaParameter[i];
-      JavaHelpers javaHelper1 = param.getJavaType();
-      if(javaHelper1 instanceof JavaClass){
-        JavaClass javaClass = (JavaClass)javaHelper1;
-        if(TypeFactory.recognizedBean(javaClass.getJavaName()))return true;
-          Iterator m=javaClass.getMethods().iterator();
-          while (m.hasNext()) {
-            Method method2=(Method)m.next();
-            if (javaClass.getName().equals(method2.getName())){
-              //now the inputs
-              JavaParameter javaParam[] = method2.listParametersWithoutReturn();
-              if (javaParam.length > 0){
-                //then we have no default constructor
-                fUnsupportedParameterName = param.getName(); 
-    	        ok = false;
-              }    
-              else return true;
-            } 
-          }
-        }
-      }
-  return ok;
-  }
-
- 
-
-
-
-
-
-
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofParameterVisitorAction.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofParameterVisitorAction.java
deleted file mode 100644
index f2ce051..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofParameterVisitorAction.java
+++ /dev/null
@@ -1,84 +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.consumption.codegen.javamofvisitoractions;
-
-import org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors.JavaMofTypeVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.BeanModelElementsFactory;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.ParameterElement;
-import org.eclipse.wst.command.env.core.common.Choice;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-
-
-
-/**
-* Objects of this class represent a JavaMofBeanVisitorAction.
-* This VisitorAction will create a parameterElement using the 
-* JavaClass and the BeanModelElementsFactory
-* It will also automatically walk to its type
-* */
-public class JavaMofParameterVisitorAction extends JavaMofBeanVisitorAction 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-  private MessageUtils msgUtils_;
-    
-  /*
-  *Constructor
-  **/
-  public JavaMofParameterVisitorAction(Element parentElement,String project, Environment env)
-  {
-    super(parentElement,project, env);
-	String pluginId = "org.eclipse.jst.ws.consumption";
-	msgUtils_ = new MessageUtils(pluginId + ".plugin", this);    
-  }
-   
-  /**
-  * Create a parameter element from the method 
-  * @param JavaParameter the mof element to be used to create the Parameter
-  **/
-  public Status visit (Object ijavaParameter)
-  {
-  	Status status = new SimpleStatus("");
-  	Choice OKChoice = new Choice('O', msgUtils_.getMessage("LABEL_OK"), msgUtils_.getMessage("DESCRIPTION_OK"));
-  	Choice CancelChoice = new Choice('C', msgUtils_.getMessage("LABEL_CANCEL"), msgUtils_.getMessage("DESCRIPTION_CANCEL"));
-  	
-    ParameterElement parameterElement = (ParameterElement)BeanModelElementsFactory.getBeanModelElement(ijavaParameter,fParentElement);
-    JavaMofTypeVisitorAction typeVisitorAction = new JavaMofTypeVisitorAction(parameterElement,clientProject, env_);
-    //typeVisitorAction.setStatusMonitor(getStatusMonitor());
-    typeVisitorAction.setReturnParam(parameterElement.isReturn());
-    JavaMofTypeVisitor typeVisitor = new JavaMofTypeVisitor(env_);
-    typeVisitor.setClientProject(getProject());
-    status = typeVisitor.run(ijavaParameter,typeVisitorAction);
-    //
-    int severity = status.getSeverity(); 
-    if (severity==Status.ERROR)
-    	return status;
-    
-    if (severity==Status.WARNING)
-    {
-      Choice result = env_.getStatusHandler().report(status, new Choice[]{OKChoice, CancelChoice});
-      if (result.getLabel().equals(CancelChoice.getLabel()))
-      {
-      	 //return an error status since the user canceled
-      	  return new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_SAMPLE_CREATION_CANCELED"), Status.ERROR);
-      }
-      	
-    }
-    //           
-    return status;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofTypeVisitorAction.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofTypeVisitorAction.java
deleted file mode 100644
index b6e498b..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofTypeVisitorAction.java
+++ /dev/null
@@ -1,118 +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.consumption.codegen.javamofvisitoractions;
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors.JavaMofBeanVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.BeanModelElementsFactory;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeElement;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeFactory;
-import org.eclipse.wst.command.env.core.common.Choice;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-
-
-
-
-/**
-* Objects of this class represent a JavaMofBeanVisitorAction.
-* This VisitorAction will create a TypeElement using the
-* JavaClass and the BeanModelElementsFactory
-* It will also automatically walk a complex type
-* */
-public class JavaMofTypeVisitorAction extends JavaMofBeanVisitorAction
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-  private MessageUtils msgUtils_;
-
-  /*
-  *Constructor
-  **/
-  public JavaMofTypeVisitorAction(Element parentElement,String project, Environment env)
-  {
-    super(parentElement,project, env);
-	String pluginId = "org.eclipse.jst.ws.consumption";
-	msgUtils_ = new MessageUtils(pluginId + ".plugin", this);    
-  }
-
-  /**
-  * Create a type element from the JavaHelper
-  * @param JavaHelper the mof element to be used to create the Type
-  **/
-  public Status visit (Object typeNavigator)
-  {
-  	 Status status = new SimpleStatus("");
-   	 Choice OKChoice = new Choice('O', msgUtils_.getMessage("LABEL_OK"), msgUtils_.getMessage("DESCRIPTION_OK"));
-  	 Choice CancelChoice = new Choice('C', msgUtils_.getMessage("LABEL_CANCEL"), msgUtils_.getMessage("DESCRIPTION_CANCEL"));  	 
-
-     //if bean
-	 JavaClass javaClass = null;
-	 if(typeNavigator instanceof JavaClass){
-	    javaClass = (JavaClass)typeNavigator;
-	 }
-
-
-     /* If we are dealing with a return parameter then we need to treat this differently then if it is an input 
-     *  parameter.
-     *  We need to first see if it is a special case for return types if not we treat it the same as everything
-     *  else.
-     */
-     if(getReturnParam() && TypeFactory.isRecognizedReturnType((JavaHelpers)typeNavigator)){
-       TypeElement typeElement = (TypeElement)BeanModelElementsFactory.getBeanModelElement(typeNavigator,fParentElement);
-     }	
-     else{
-	    if(TypeFactory.isUnSupportedType((JavaHelpers)typeNavigator)){
-	      status = new SimpleStatus("", msgUtils_.getMessage("MSG_WARN_JTS_UNSUPPORTED_TYPE") + ((JavaHelpers)typeNavigator).getJavaName(), Status.WARNING );	    	
-	      //getStatusMonitor().reportStatus( new Status(IStatus.WARNING,WebServiceConsumptionPlugin.ID,0,
-              //WebServiceConsumptionPlugin.getMessage( "%MSG_WARN_JTS_UNSUPPORTED_TYPE" ) + ((JavaHelpers)typeNavigator).getJavaName(),null));
-	      return status;
-	    }	
-	    
-	    //if javaclass is null then we have a simple type 
-	    if((javaClass == null) || TypeFactory.recognizedBean(javaClass.getJavaName())){
-	      TypeElement typeElement = (TypeElement)BeanModelElementsFactory.getBeanModelElement(typeNavigator,fParentElement);
-	    }
-	    else{
-	      JavaMofBeanVisitorAction beanVisitorAction = new JavaMofBeanVisitorAction(fParentElement,clientProject, env_);
-	      beanVisitorAction.setStatusMonitor(getStatusMonitor());
-	      beanVisitorAction.setBeansCreated(getBeansCreated());
-          beanVisitorAction.setReturnParam(getReturnParam());
-		  JavaMofBeanVisitor beanVisitor = new JavaMofBeanVisitor();
-	      status = beanVisitor.run(javaClass,beanVisitorAction);
-	    }
-     }
-     
-     //
-     int severity = status.getSeverity(); 
-     if (severity==Status.ERROR)
-     	return status;
-     
-     if (severity==Status.WARNING)
-     {
-       Choice result = env_.getStatusHandler().report(status, new Choice[]{OKChoice, CancelChoice});
-       if (result.getLabel().equals(CancelChoice.getLabel()))
-       {
-       	 //return an error status since the user canceled
-       	  return new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_SAMPLE_CREATION_CANCELED"), Status.ERROR);
-       }
-       	
-     }
-     //
-     return status;
-   }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/VisitorActionImpl.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/VisitorActionImpl.java
deleted file mode 100644
index f8b43d5..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/VisitorActionImpl.java
+++ /dev/null
@@ -1,98 +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.consumption.codegen.javamofvisitoractions;
-
-import java.util.Vector;
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.ws.internal.consumption.codegen.Visitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.VisitorAction;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-
-
-
-
-
-/**
-* Objects of this class represent a VisitorAction.
-* It will automatically walk the methods in the JavaClass
-* */
-public abstract class VisitorActionImpl implements VisitorAction 
-{
-
-  private Visitor fVisitor = null;
-  private Vector beansVisited = null;
-  private Vector messages = null;
-  private MessageUtils msgUtils_;
-
-  public VisitorActionImpl( Vector messages, Vector beansVisited)
-  	{
-  	 this.messages = messages;
-  	 this.beansVisited = beansVisited;
-     msgUtils_ = new MessageUtils( "org.eclipse.jst.ws.consumption.plugin", this );
-  	}
-  
-  public void initialize(String resident)
-  {
-    //nothing to be done but must be implemented
-  }
-
- /**
-  * Returns the vector of all messages found
-  */
-  public Vector getMessages ()
-  {
-  	if (messages == null) 
-  		messages = new Vector();
-    return messages;
-  }
-
-  public Vector getBeansVisited()
-  	{
-		if ( beansVisited == null)
-  			beansVisited = new Vector(); 
-        return beansVisited;
-   }
-
-  public void addVisitedBean( JavaClass bean)
-  	{
-  		if ( beansVisited == null)
-  			beansVisited = new Vector();
-  		beansVisited.add(bean);
-  	}
-
-  public boolean isBeanVisited (JavaClass bean)
-  	{
-  		return (beansVisited != null && beansVisited.contains(bean));
-  	}
-
-  /**
-  * sets the visitor that calls the visit
-  * @parameter Visitor
-  */
-
-  public void setVisitor(Visitor visitor)
-  {
-      fVisitor = visitor;
-  }
-
-  protected void addMessage ( String key )
-  {
-    getMessages().add(msgUtils_.getMessage(key));
-  }
-
-  protected void addMessage ( String key, Object[] args )
-  {
-    getMessages().add(msgUtils_.getMessage(key,args));
-  }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofAttributeVisitor.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofAttributeVisitor.java
deleted file mode 100644
index 49d5f72..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofAttributeVisitor.java
+++ /dev/null
@@ -1,241 +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.consumption.codegen.javamofvisitors;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Iterator;
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.JavaParameter;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jem.java.impl.FieldImpl;
-import org.eclipse.jst.ws.internal.consumption.codegen.Visitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.VisitorAction;
-import org.eclipse.jst.ws.internal.consumption.command.common.JavaMofReflectionCommand;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeFactory;
-import org.eclipse.jst.ws.internal.consumption.sampleapp.common.SamplePropertyDescriptor;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-
-
-/**
-* Objects of this class represent a visitor.
-* */
-public class JavaMofAttributeVisitor implements Visitor 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
-  private String clientProject;
-  private boolean returnParameter;
-  private Environment env;
-  
-  
-  public void setEnvironment(Environment env)
-  {
-  	this.env = env;
-  }
-  
-  /*
-  * Use this to reflect 
-  */
-  public void setProject(String clientProject)
-  {
-    this.clientProject = clientProject;
-  }
-
-   /*
-  * Use this to reflect 
-  */
-  public String getProject()
-  {
-    return clientProject;
-  }
-
-  public void setReturnParameter(boolean returnParameter)
-  {
-    this.returnParameter = returnParameter;
-  }
- 
-  
-  /*
-  * Get the attribute belonging to this complex type 
-  * @param JavaParameter javaParameter that owns the type
-  * @param VisitorAction Action to be performed on each method
-  **/
-  public Status run ( Object javaclass, VisitorAction vAction)
-  {
-  	Status status = new SimpleStatus("");
-    JavaClass javaClass = (JavaClass)javaclass;     
-
-    Hashtable spdMap = new Hashtable();  
-    for (Iterator m=javaClass.getPublicMethods().iterator(); m.hasNext(); ) {
-      Method method=(Method)m.next();
-      if (((method.getMethodElementSignature().startsWith("get") 
-      	|| method.getMethodElementSignature().startsWith("is")) 
-        && method.listParametersWithoutReturn().length == 0 )
-        || (method.getMethodElementSignature().startsWith("set") 
-        && method.listParametersWithoutReturn().length > 0)) {
-        int sub = 3;
-        if(method.getMethodElementSignature().startsWith("is"))
-          sub = 2;	
-        String propertyName = method.getMethodElementSignature().substring(sub);    
-        String lower = propertyName.substring(0,1).toLowerCase();
-        String remainder = propertyName.substring(1); 
-        propertyName = lower + remainder;
-        int index = propertyName.lastIndexOf("(");
-        String temp = propertyName;
-        propertyName = temp.substring(0,index); 
-        
-        //find the propertydescriptor
-        SamplePropertyDescriptor spd = (SamplePropertyDescriptor)spdMap.get(propertyName); 
-        if(spd == null){
-          spd = new SamplePropertyDescriptor(propertyName);
-          spdMap.put(propertyName,spd); 
-        }
-        if(method.getMethodElementSignature().startsWith("set"))
-          spd.setWriteMethod(method);
-        else 
-          spd.setReadMethod(method);
-
-        FieldImpl field = (FieldImpl)javaClass.getFieldNamed(propertyName);
-        JavaHelpers propertyType = null; 
-        if(field != null){
-          propertyType = field.getJavaType();
-          spd.setfStatic(field.isStatic());
-        }
-        else{
-          if(method.getMethodElementSignature().startsWith("get") || method.getMethodElementSignature().startsWith("is"))
-          	propertyType = method.getReturnType();
-          else{
-             JavaParameter params[] = method.listParametersWithoutReturn(); 
-             propertyType = params[0].getJavaType();
-          }  
-        }
-          	
-        spd.setPropertyType(propertyType); 
-        
-      }
-    }
-    Enumeration spdEnum = spdMap.elements();
-    while(spdEnum.hasMoreElements()){
-      SamplePropertyDescriptor spd = (SamplePropertyDescriptor)spdEnum.nextElement();
-      if(spdCheck(spd))
-        status = vAction.visit(spd);   
-    } 
-   
-    return status;
-
-  }
-  
-  private boolean spdCheck(SamplePropertyDescriptor spd)
-  {  
-    //check for indexed properties
-  	Method writeMethod = spd.getWriteMethod();
-  	if(writeMethod != null)
-  	  if(writeMethod.listParametersWithoutReturn().length > 1) return false;
-  	
-  	if(spd.getPropertyType() == null) return false;
-    if(spd.getPropertyType().isPrimitive()) return true;
-    if(returnParameter && TypeFactory.isRecognizedReturnType(spd.getPropertyType())) return true;
-    if(!returnParameter && TypeFactory.isUnSupportedType(spd.getPropertyType())) return true;
-    if(!checkPolarity(spd)) return false;   
-       
-    // so its a bean make sure it has a default constructor       
-    JavaMofReflectionCommand javaMofRef = new JavaMofReflectionCommand();
-    javaMofRef.setClientProject(getProject());
-    javaMofRef.setProxyBean(((JavaHelpers)spd.getPropertyType()).getQualifiedName());
-    javaMofRef.execute(env);
-    if(javaMofRef.getJavaClass() instanceof JavaClass){
-       if(TypeFactory.recognizedBean(javaMofRef.getJavaClass().getJavaName())) return true;
-       return defaultCheck((JavaClass)javaMofRef.getJavaClass());
-               
-    }
-    return true;
-  
-  }
-  
-  private boolean checkPolarity(SamplePropertyDescriptor spd){
-    
-  	Method readMethod = spd.getReadMethod();
-  	Method writeMethod = spd.getWriteMethod();
-  	if((readMethod == null && writeMethod != null) || (readMethod != null && writeMethod == null))
-  	  return true;	
-  	if(readMethod == null && writeMethod == null)
-  	  return false;	
-  	  	
-  	JavaParameter javaParameter[] = writeMethod.listParametersWithoutReturn();
-    for(int i = 0;i< javaParameter.length;i++){
-      JavaParameter jp = javaParameter[i]; 	
-      String name1 = jp.getJavaType().getJavaName();
-      String name = readMethod.getReturnType().getJavaName();
-      if(jp.getJavaType().getJavaName().equals(readMethod.getReturnType().getJavaName()))
-        return true; 
-    }
-  	return false;
-  }
-  
-  private boolean defaultCheck(JavaClass javaClass){
-    
-       Iterator m=javaClass.getMethods().iterator();
-        //now check for a default constructor
-        boolean defaultConst = true;
-        while (m.hasNext()) {
-          Method method=(Method)m.next();
-          if (javaClass.getName().equals(method.getName())){
-                //now the inputs
-                JavaParameter javaParameter[] = method.listParametersWithoutReturn();
-                if (javaParameter.length > 0){
-                      //then we have no default constructor
-                      defaultConst = false; 
-                }
-                else if(javaParameter.length == 0){
-                     if (method.getJavaVisibility().getValue() == 0)
-                       return true;
-                }
-          }
-       }
-    
-       return defaultConst;
-  }
-  
-  private boolean polarityCheck(JavaClass javaClass){
-    
-       Iterator m=javaClass.getMethods().iterator();
-        //now check for a default constructor
-        boolean defaultConst = true;
-        while (m.hasNext()) {
-          Method method=(Method)m.next();
-          if (javaClass.getName().equals(method.getName())){
-                //now the inputs
-                JavaParameter javaParameter[] = method.listParametersWithoutReturn();
-                if (javaParameter.length > 0){
-                      //then we have no default constructor
-                      defaultConst = false; 
-                }
-                else if(javaParameter.length == 0){
-                     if (method.getJavaVisibility().getValue() == 0)
-                       return true;
-                }
-          }
-       }
-    
-       return defaultConst;
-  }
-        
-  
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofBeanVisitor.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofBeanVisitor.java
deleted file mode 100644
index d338a34..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofBeanVisitor.java
+++ /dev/null
@@ -1,45 +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.consumption.codegen.javamofvisitors;
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.ws.internal.consumption.codegen.Visitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.VisitorAction;
-import org.eclipse.wst.command.env.core.common.Status;
-
-
-
-
-/**
-* Objects of this class represent a visitor.
-* */
-public class JavaMofBeanVisitor implements Visitor 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
-  /*
-  *Constructor
-  **/
-  public JavaMofBeanVisitor()
-  {
-  }
- 
-  public Status run ( Object javaClass, VisitorAction vAction)
-  {
-    return vAction.visit((JavaClass)javaClass);   
-  }
-        
-  
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofFieldVisitor.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofFieldVisitor.java
deleted file mode 100644
index c1a3961..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofFieldVisitor.java
+++ /dev/null
@@ -1,139 +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.consumption.codegen.javamofvisitors;
-
-import java.util.Iterator;
-import java.util.ListIterator;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jem.java.Field;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaParameter;
-import org.eclipse.jem.java.JavaVisibilityKind;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jem.java.impl.FieldImpl;
-import org.eclipse.jst.ws.internal.consumption.codegen.Visitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.VisitorAction;
-import org.eclipse.jst.ws.internal.consumption.command.common.JavaMofReflectionCommand;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeFactory;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-
-
-/**
-* Objects of this class represent a visitor.
-* */
-public class JavaMofFieldVisitor implements Visitor 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
-  private String clientProject;
-
-  /*
-  * Constructor
-  **/
-  public JavaMofFieldVisitor()
-  {
-  }
-
-  /*
-  * Use this to reflect 
-  */
-  public void setProject(String clientProject)
-  {
-    this.clientProject = clientProject;
-  }
-
-   /*
-  * Use this to reflect 
-  */
-  public String getProject()
-  {
-    return clientProject;
-  }
-
-  /*
-  * Get the attribute belonging to this complex type 
-  * @param JavaParameter javaParameter that owns the type
-  * @param VisitorAction Action to be performed on each method
-  **/
-  public Status run ( Object javaclass, VisitorAction vAction)
-  {
-  	Status status = new SimpleStatus("");
-    JavaClass javaClass = (JavaClass)javaclass;     
-
-    boolean holderClass = false;
-    EList implemented = javaClass.getImplementsInterfaces();
-	for (int i = 0; i < implemented.size(); i++) {
-	  JavaClass anInterface = (JavaClass) implemented.get(i);
-	  if (anInterface.getQualifiedName().equals("javax.xml.rpc.holders.Holder"))
-	    holderClass = true;
-	}      
-
-     //beaninfo code
-    if(holderClass){     
-      EList e  = javaClass.getFields();
-      ListIterator list = e.listIterator();
-      while(list.hasNext()){
-        Field field = (Field)list.next();     
-        if(field.getJavaVisibility().getValue() == JavaVisibilityKind.PUBLIC && !field.isFinal() && !field.isStatic()){
-          if(fieldCheck((FieldImpl)field))
-            status = vAction.visit(field);
-        }
-      }
-    }
-    
-    return status;
-  }       
-  private boolean fieldCheck(FieldImpl field)
-  {
-    // so its a bean make sure it has a default constructor 
-    JavaMofReflectionCommand javaMofRef = new JavaMofReflectionCommand();
-    javaMofRef.setProxyBean(field.getJavaType().getQualifiedName());
-    javaMofRef.setClientProject(getProject());
-    javaMofRef.execute(null);
-    if(javaMofRef.getJavaClass() instanceof JavaClass){
-      if(TypeFactory.recognizedBean(javaMofRef.getJavaClass().getJavaName())) return true;
-      return defaultCheck((JavaClass)javaMofRef.getJavaClass());
-    }
-    return true;
-  }
-        
- private boolean defaultCheck(JavaClass javaClass){
-    
-   Iterator m=javaClass.getMethods().iterator();
-   //now check for a default constructor
-   boolean defaultConst = true;
-   while (m.hasNext()) {
-    Method method=(Method)m.next();
-    if (javaClass.getName().equals(method.getName())){
-      //now the inputs
-      JavaParameter javaParameter[] = method.listParametersWithoutReturn();
-      if (javaParameter.length > 0){
-        //then we have no default constructor
-        defaultConst = false; 
-      }
-      else if(javaParameter.length == 0){
-        if (method.getJavaVisibility().getValue() == 0)
-          return true;
-        else if(method.getJavaVisibility().getValue() == 1) 
-          defaultConst = false;
-      }
-    }
-  }
-    
-  return defaultConst;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofMethodVisitor.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofMethodVisitor.java
deleted file mode 100644
index e2b2d92..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofMethodVisitor.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.consumption.codegen.javamofvisitors;
-
-import java.util.Iterator;
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.ws.internal.consumption.codegen.Visitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.VisitorAction;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.command.env.core.selection.BooleanSelection;
-
-
-/**
-* Objects of this class represent a visitor.
-* */
-public class JavaMofMethodVisitor implements Visitor 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-  public String SET_ENDPOINT = "setEndPoint";
-  public String GET_ENDPOINT = "getEndPoint";
-  private BooleanSelection[] fMethodsSelected;
-
-
-  /*
-  * Constructor
-  **/
-  public JavaMofMethodVisitor()
-  {
-  }
- 
-  public String UNDER_SCORE = "_";
-
-  /*
-  * Run through all the methods in this bean
-  * @param JavaClass javaclass that holds the methods
-  * @param VisitorAction Action to be performed on each method
-  **/
-  public Status run ( Object javaclass, VisitorAction vAction)
-  {
-  	Status status = new SimpleStatus("");
-    JavaClass javaClass = (JavaClass)javaclass;
-    for (Iterator m=javaClass.getPublicMethods().iterator(); m.hasNext(); ) {
-      Method method=(Method)m.next();
-      if(fMethodsSelected != null)  {
-        boolean methodSelected = false;
-      	for(int i =0;i < fMethodsSelected.length;i++){
-          if(fMethodsSelected[i] == null) continue;
-          if ( fMethodsSelected[i].getValue().equals(method.getMethodElementSignature()))
-            methodSelected = (boolean) fMethodsSelected[i].isSelected();
-        }		        	
-        String methodName = method.getName();
-        if(methodSelected)
-          status = vAction.visit(method);  
-        
-      }
-      else {
-        status = vAction.visit(method);   
-      }
-
-    }
-    return status;
-  }
-
-  public void setMethodSelection(BooleanSelection[] methodSelected)
-  {
-    fMethodsSelected = methodSelected;
-  }
-  
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofParameterVisitor.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofParameterVisitor.java
deleted file mode 100644
index 8be991f..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofParameterVisitor.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 Eclipse Public License v1.0
- * which accompanies 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.consumption.codegen.javamofvisitors;
-
-import java.util.List;
-
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.JavaParameter;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.ws.internal.consumption.codegen.Visitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.VisitorAction;
-import org.eclipse.wst.command.env.core.common.Choice;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-
-
-/**
-* Objects of this class represent a visitor.
-* */
-public class JavaMofParameterVisitor implements Visitor 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-  private MessageUtils msgUtils_;
-  private Environment env_;
-
-  /*
-  * Constructor
-  **/
-  public JavaMofParameterVisitor(Environment env)
-  {
-	String pluginId = "org.eclipse.jst.ws.consumption";
-	msgUtils_ = new MessageUtils(pluginId + ".plugin", this);  	
-  	env_ = env;
-  }
-  
-  /*
-  * Run through all the parameters in this method
-  * @param JavaClass javaclass that holds the parameters
-  * @param VisitorAction Action to be performed on each method
-  **/
-  public Status run ( Object imethod, VisitorAction vAction)
-  {
-  	Status status = new SimpleStatus("");
-  	Choice OKChoice = new Choice('O', msgUtils_.getMessage("LABEL_OK"), msgUtils_.getMessage("DESCRIPTION_OK"));
-  	Choice CancelChoice = new Choice('C', msgUtils_.getMessage("LABEL_CANCEL"), msgUtils_.getMessage("DESCRIPTION_CANCEL"));  	
-    Method method = (Method)imethod;
-   
-    JavaHelpers javaReturnParameter = method.getReturnType();
-    //pgm This visitor used to take a JavaParameter type and now it is being called
-    //    with a JavaHelpers type.  Gil, please ensure that this is Ok.
-    status = vAction.visit(javaReturnParameter);
-    //
-    int severity = status.getSeverity(); 
-    if (severity==Status.ERROR)
-    	return status;
-    
-    if (severity==Status.WARNING)
-    {
-      Choice result = env_.getStatusHandler().report(status, new Choice[]{OKChoice, CancelChoice});
-      if (result.getLabel().equals(CancelChoice.getLabel()))
-      {
-      	 //return an error status since the user canceled
-      	  return new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_SAMPLE_CREATION_CANCELED"), Status.ERROR);
-      }
-      	
-    }
-    //           
-
-    //now the inputs
-    List parameters = method.getParameters(); 
-    
-    for (int index = 0; index < parameters.size(); index++) 
-    {
-      JavaParameter param=(JavaParameter)parameters.get(index);
-      status = vAction.visit(param);
-      //
-      severity = status.getSeverity(); 
-      if (severity==Status.ERROR)
-      	return status;
-      
-      if (severity==Status.WARNING)
-      {
-        Choice result = env_.getStatusHandler().report(status, new Choice[]{OKChoice, CancelChoice});
-        if (result.getLabel().equals(CancelChoice.getLabel()))
-        {
-        	 //return an error status since the user canceled
-        	  return new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_SAMPLE_CREATION_CANCELED"), Status.ERROR);
-        }
-        	
-      }
-      //      
-    }
-    
-    return status;
-    
-  }
-  
-        
-  
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofTypeVisitor.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofTypeVisitor.java
deleted file mode 100644
index 543dcc5..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofTypeVisitor.java
+++ /dev/null
@@ -1,111 +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.consumption.codegen.javamofvisitors;
-
-import org.eclipse.jem.java.Field;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.JavaParameter;
-import org.eclipse.jem.java.impl.FieldImpl;
-import org.eclipse.jst.ws.internal.consumption.codegen.Visitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.VisitorAction;
-import org.eclipse.jst.ws.internal.consumption.command.common.JavaMofReflectionCommand;
-import org.eclipse.jst.ws.internal.consumption.sampleapp.common.SamplePropertyDescriptor;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-
-
-
-/**
-* Objects of this class represent a visitor.
-* */
-public class JavaMofTypeVisitor implements Visitor 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  private Environment env_;
-
-  private String clientProject;
-
-  /*
-  * Constructor
-  **/
-  public JavaMofTypeVisitor(Environment env)
-  {
-  	env_ = env;
-  }
-
-   /*
-  * Use this to reflect 
-  */
-  public void setClientProject(String clientProject)
-  {
-    this.clientProject = clientProject;
-  }
-
-   /*
-  * Use this to reflect 
-  */
-  public String getClientProject()
-  {
-    return clientProject;
-  }
-  
-  /*
-  * Get the type belonging to the parameter
-  * @param JavaParameter javaParameter that owns the type
-  * @param VisitorAction Action to be performed on each method
-  **/
-  public Status run ( Object typeNavigator, VisitorAction vAction)
-  {
-  	Status status = new SimpleStatus("");
-    if (typeNavigator instanceof JavaParameter){
-
-      JavaParameter javaParameter = (JavaParameter)typeNavigator;
-      JavaHelpers javaHelpers = javaParameter.getJavaType();
-      status = vAction.visit(javaHelpers);
-    }
-    else if (typeNavigator instanceof JavaHelpers){
-    	status = vAction.visit(typeNavigator);	
-    }
-    else if (typeNavigator instanceof SamplePropertyDescriptor){
-      SamplePropertyDescriptor pd = (SamplePropertyDescriptor)typeNavigator;
-      JavaMofReflectionCommand javaMofRef = new JavaMofReflectionCommand();
-      javaMofRef.setClientProject(clientProject);
-      javaMofRef.setProxyBean(((JavaHelpers)pd.getPropertyType()).getQualifiedName());
-      status = javaMofRef.execute(env_);
-      if (status.getSeverity()==Status.ERROR)
-      	return status;
-      
-      status = vAction.visit(javaMofRef.getJavaClass());
-    }
-    else if (typeNavigator instanceof Field){
-      FieldImpl field = (FieldImpl)typeNavigator;
-      JavaMofReflectionCommand javaMofRef = new JavaMofReflectionCommand();
-      javaMofRef.setClientProject(clientProject);
-      javaMofRef.setProxyBean(field.getJavaType().getQualifiedName());
-     
-      status = javaMofRef.execute(env_);
-      if (status.getSeverity()==Status.ERROR)
-      	return status;
-      
-      status = vAction.visit(javaMofRef.getJavaClass());
-    }
-    
-    return status;
-  }
-  
-        
-  
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AbstractStartServer.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AbstractStartServer.java
deleted file mode 100644
index 12388e5..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AbstractStartServer.java
+++ /dev/null
@@ -1,165 +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.consumption.command.common;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.jst.j2ee.internal.earcreation.EARNatureRuntime;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin;
-import org.eclipse.wst.command.env.core.common.Log;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.eclipse.EclipseLog;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerUtil;
-
-public abstract class AbstractStartServer {
- 
-private IProject project = null;
-protected IProgressMonitor monitor;
-private Log log_;
-private MessageUtils msgUtils_;
-
-public AbstractStartServer()
-{
-	log_ = new EclipseLog();
-    msgUtils_ = new MessageUtils( "org.eclipse.jst.ws.consumption.plugin", this );
-}
-
-/**
- * Execute the command
- */
-public void StartServer (IProject project, IServer server, IProgressMonitor monitor, boolean restart) throws CoreException
-{
-	this.project = project;
-	this.monitor = monitor;
-
-   try
-  {
-   	
-//    IJavaServer javaServer = (IJavaServer) server.getDelegate();
-//    addJarsToClassPath(javaServer);
-    validateRemoteServerPath(server);
-
-    if (server.getServerState() != IServer.STATE_STOPPED)  // The Server is running
-    { 
-      if (server.getServerRestartState())
-      {    
-      	
-        server.synchronousStop(false);
-        log_.log(Log.INFO, 5050, this, "StartServer", "project="+project+", Stop command completed, restart needed");
-        publishProject(server);
-    	startProject(server);
-      }
-      else
-      {
-      	
-        if (restart) // WEB-INF\lib need to be reloaded
-        {
-          publishProject(server);      
-          restartProject(project, server);
-        }         
-      }
-    }
-    else {
-   	
-    		publishProject(server);
-    		startProject(server);
-    	}
-}
-
-  catch (CoreException ce) {
-  	throw ce;
-  	}
-  catch (Exception e) {
-    throw new CoreException(new Status(IStatus.ERROR,WebServiceConsumptionPlugin.ID,0,msgUtils_.getMessage("MSG_ERROR_SERVER"),e));
-  }
-}
-
-protected void publishProject(IServer server) throws CoreException
-{
-      monitor.subTask( msgUtils_.getMessage( "PROGRESS_INFO_PUBLISHING_SERVER" ) );
-      IStatus status = server.publish(IServer.PUBLISH_INCREMENTAL, monitor);
-      if (status.getSeverity() != IStatus.OK)
-      	throw new CoreException(status);
-      log_.log(Log.INFO, 5051, this, "publishProject", "IServer="+server+", Publish command completed");
- }
-
-protected void startProject(IServer server) throws CoreException
-{
-  try
-  {
-    monitor.subTask( msgUtils_.getMessage( "PROGRESS_INFO_STARTING_SERVER" ) );    
-    server.synchronousStart(ILaunchManager.RUN_MODE, monitor);
-    log_.log(Log.INFO, 5052, this, "startProject", "IServer="+server+", Start command completed");
-    
-  }
-  catch (Exception e) {
-    throw new CoreException(new Status(IStatus.ERROR,WebServiceConsumptionPlugin.ID,0,msgUtils_.getMessage("MSG_ERROR_SERVER"),e));
-  }  
-}
-
-protected void restartProject(IProject project, IServer server) throws CoreException
-{
-  try
-  {
-
-    monitor.subTask( msgUtils_.getMessage( "PROGRESS_INFO_STARTING_SERVER" ) );
-    EARNatureRuntime[] ears = J2EEUtils.getEARProjects(project);
-    for (int i = 0; i < ears.length; i++)
-    {
-      IProject earProject = ears[i].getProject();
-      if (earProject != null && ServerUtil.containsModule(server,ResourceUtils.getModule(earProject), monitor))    
-      {
-        (new org.eclipse.wst.server.ui.actions.RestartProjectAction(earProject)).run();
-        log_.log(Log.INFO, 5053, this, "restartProject", "earProject="+earProject+", Restart project command completed");
-       
-      }
-    }
-  }
-  catch (Exception e) {
-    throw new CoreException( new Status(IStatus.ERROR,WebServiceConsumptionPlugin.ID,0,msgUtils_.getMessage("MSG_ERROR_SERVER"),e));
-  }  
-}
-
-public void runPreServerConfig(IServer server, IProject EARProject){
-
-	return;
-	
-}
-
-public void runPostServerConfig(IServer server, IProject EARProject){
-
-	return;
-}
-
-
-protected abstract void addJarsToClassPath(IServer server) throws CoreException;
-protected abstract void validateRemoteServerPath(IServer server) throws CoreException;
-
-public void stopServer(IServer server) throws CoreException {
-
-	if (server != null) {
-
-		if (server.getServerState() != IServer.STATE_STOPPED) {
-			server.synchronousStop(false);
-		}
-	}	
-	
-}
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AddModuleToServerCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AddModuleToServerCommand.java
deleted file mode 100644
index bf82255..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AddModuleToServerCommand.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.eclipse.jst.ws.internal.consumption.command.common;
-
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-
-public class AddModuleToServerCommand extends SimpleCommand
-{
-  private String serverInstanceId;
-	private String project;
-	private String module;
-	
-	public Status execute(Environment env)
-	{
-		return new SimpleStatus("");
-	}
-
-	public void setModule(String module)
-	{
-		this.module = module;
-	}
-
-	public void setProject(String project)
-	{
-		this.project = project;
-	}
-
-	public void setServerInstanceId(String serverInstanceId)
-	{
-		this.serverInstanceId = serverInstanceId;
-	}	
-
-	
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AssociateModuleWithEARCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AssociateModuleWithEARCommand.java
deleted file mode 100644
index 6393707..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AssociateModuleWithEARCommand.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.eclipse.jst.ws.internal.consumption.command.common;
-
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-
-public class AssociateModuleWithEARCommand extends SimpleCommand
-{
-	private String						project_;
-  private String            module_;
-	private String						earProject_;
-  private String            ear_;
-	
-	public Status execute(Environment env)
-	{
-		return new SimpleStatus("");
-	}
-	
-  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;  
-  }	
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/BuildProjectCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/BuildProjectCommand.java
deleted file mode 100644
index 2d9760b..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/BuildProjectCommand.java
+++ /dev/null
@@ -1,97 +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.consumption.command.common;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.validate.ValidationManager;
-import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-
-
-public class BuildProjectCommand extends SimpleCommand 
-{
-  private ValidationManager validationManager;
-  private IProject project_;
-  private boolean forceBuild_;
-  // rm private Model model;
-
-  /**
-   * Default CTOR;
-   */
-  public BuildProjectCommand()
-  {
-    super( WebServiceConsumptionPlugin.getMessage("%TASK_LABEL_WEBSERVICE_BUILD_PROJECT"),
-           WebServiceConsumptionPlugin.getMessage("%TASK_DESC_WEBSERVICE_BUILD_PROJECT") );
-  }
-
-  /**
-   * Execute the command
-   */
-  public Status execute(Environment env)
-  {
-    try
-    {
-      if (forceBuild_)
-        project_.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor());
-      else if (validationManager == null)
-        project_.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor());
-      else if (validationManager.getWorkspaceAutoBuildPreference())
-        project_.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor());
-    }
-    catch (Exception e)
-    {
-    }
-    /*
-    try
-    {
-      Platform.getJobManager().join(null, new NullProgressMonitor());
-    }
-    catch (InterruptedException ie)
-    {
-      // continue execution
-    }
-    catch (OperationCanceledException oce)
-    {
-      // continue execution
-    }
-    */
-    return new SimpleStatus("");
-  }
-  /**
-   * @param forceBuild The forceBuild to set.
-   */
-  public void setForceBuild(boolean forceBuild) {
-    this.forceBuild_ = forceBuild;
-  }
-
-  /**
-   * @param project The project to set.
-   */
-  public void setProject(IProject project) {
-    this.project_ = project;
-  }
-
-  /**
-   * @param validationManager The validationManager to set.
-   */
-  public void setValidationManager(ValidationManager validationManager) {
-    this.validationManager = validationManager;
-  }
-
-  
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CheckProjectOKCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CheckProjectOKCommand.java
deleted file mode 100644
index 8bd96b7..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CheckProjectOKCommand.java
+++ /dev/null
@@ -1,75 +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.consumption.command.common;
-
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-
-public class CheckProjectOKCommand extends SimpleCommand {
-
-  private String serviceServerTypeId_;
-
-  private MessageUtils msgUtils_;
-
-  /**
-   * Default CTOR
-   */
-  public CheckProjectOKCommand() {
-    String pluginId = "org.eclipse.jst.ws.consumption";
-    msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-
-  }
-
-  public Status execute(Environment env) {
-    Status status = new SimpleStatus("");
-    
-    String typeid = serviceServerTypeId_;
-    IServer[] servers = ServerCore.getServers();
-//    Iterator iterator = servers.iterator();
-    boolean viewOpen = false;
-    String serverName = null;
-
-    for (int i=0;i<servers.length;i++) {
-      IServer server = (IServer) servers[i];
-
-      // If the configuration editor is open for the server that we are
-      // deploying
-      // to we will prompt the user to close it.
-      if (server != null && server.getServerType().getId().equals(typeid)) {
-        viewOpen = true;
-        serverName = server.getName();
-        break;
-      }
-    }
-
-    if (viewOpen) {
-      String errorMessage = msgUtils_.getMessage("MSG_ERROR_SERVER_VIEW_OPEN", new String[] { serverName});
-      return new SimpleStatus("", errorMessage, Status.ERROR, null);
-      
-    }
-    
-    return status;
-  }
-
-  /**
-   * @param serviceServerId
-   *            The serviceServer factory Id to set.
-   */
-  public void setServiceServerTypeID(String serviceServerId) {
-    this.serviceServerTypeId_ = serviceServerId;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ClientServerDeployableConfigCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ClientServerDeployableConfigCommand.java
deleted file mode 100644
index 7ae523d..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ClientServerDeployableConfigCommand.java
+++ /dev/null
@@ -1,226 +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.consumption.command.common;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.ws.internal.common.EnvironmentUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.IServerWorkingCopy;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.server.core.ServerUtil;
-
-public class ClientServerDeployableConfigCommand extends SimpleCommand {
-
-  private String LABEL = "ClientServerDeployableConfigCommand";
-  private String DESCRIPTION = "Ensure Deployable is added to Server Configuration for client projects";
-  private MessageUtils msgUtils_;
-  private Boolean creationScenario_ = Boolean.TRUE;
-  private TypeRuntimeServer clientIds_;
-  private IProject sampleProject_;
-  private String serviceServerTypeID_;
-  private String sampleServerTypeID_;
-  private IServer serviceExistingServer_;
-  private IServer sampleExistingServer_;
-  private String serviceProjectURL_;
-  private String sampleProjectURL_;
-
-  //addedProjectToServer_ is set to true if
-  //- the project exists AND
-  //- the server exists (i.e. this command did not create it) AND
-  //- this command added the project to the server
-  private boolean addedProjectToServer_ = false;  
-  /**
-   * Default CTOR
-   */
-  public ClientServerDeployableConfigCommand() {
-    String pluginId = "org.eclipse.jst.ws.consumption";
-    msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-    setDescription(DESCRIPTION);
-    setName(LABEL);
-  }
-
-  /**
-   * Default CTOR
-   */
-  public ClientServerDeployableConfigCommand(boolean creationScenario) {
-    String pluginId = "org.eclipse.jst.ws.consumption";
-    msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-    setDescription(DESCRIPTION);
-    setName(LABEL);
-    creationScenario_ = new Boolean(creationScenario);
-  }
-
-  /**
-   * execute
-   */
-  public Status execute(Environment env) {
-
-    Status status = new SimpleStatus("");
-    try {
-
-      // determine client or service project
-      IProject project =  sampleProject_;
-      if (project == null)
-        return status;
-
-      // get sample server factory Id and instanceId
-      String serverFactoryId = clientIds_.getServerId();
-      String existingServerInstId = clientIds_.getServerInstanceId();
-      IServer server = null;
-      if (existingServerInstId ==null) {
-      	server= sampleExistingServer_;
-      }
-      else {
-      // get an IServer object; either existing or create one
-       server = ServerCore.findServer(existingServerInstId);
-      }
-   
-      if (server != null) {
-      	// find exact server for given project
-        IServer[] servers = ServerUtil.getServersByModule(ResourceUtils.getModule(project), null);
-        boolean foundServer = false;
-        for (int i = 0; i < servers.length; i++) {
-          if (servers[i].equals(server))
-            foundServer = true;
-        }
-        if (!foundServer) {
-        	Status modStatus = ServerUtils.getInstance().modifyModules(env ,server, ResourceUtils.getModule(project), true, EnvironmentUtils.getIProgressMonitor(env));
-        	if (modStatus.getSeverity()==Status.ERROR)
-        		return modStatus;
-        	
-            addedProjectToServer_ = true;
-        }
-      }
-      else {
-        if (ResourceUtils.isTrueJavaProject(project))
-        {
-          //Don't attempt to add a Java project to a server, therefore passing in null for the module.
-          server = ServerUtils.getInstance().createServer(env, null, serverFactoryId, EnvironmentUtils.getIProgressMonitor(env));
-        }
-        else
-        {
-          server = ServerUtils.getInstance().createServer(env, ResourceUtils.getModule(project), serverFactoryId, EnvironmentUtils.getIProgressMonitor(env));
-        }
-        if (server == null) {
-          status = new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_CREATE_SERVER"), Status.ERROR);
-          env.getStatusHandler().reportError(status);
-          return status;
-        }
-        
-        IModule[] parentModules = server.getRootModules(ResourceUtils.getModule(project),null);
-        if (parentModules!=null && parentModules.length!=0) {
-          if (!ServerUtil.containsModule(server, ResourceUtils.getModule(project), null)) {
-            Status mmStatus = ServerUtils.getInstance().modifyModules(env, server, ResourceUtils.getModule(project), true, EnvironmentUtils.getIProgressMonitor(env));
-            if (mmStatus.getSeverity()==Status.ERROR)
-              return mmStatus;
-          }
-        }        
-
-      }
-      
-      //
-      String projectURL = ResourceUtils.getWebProjectURL(project, serverFactoryId, server);
-      if (creationScenario_.booleanValue()) {
-        serviceExistingServer_ = server;
-        serviceProjectURL_ = projectURL;
-      }
-      else {
-        sampleExistingServer_ = server;
-        sampleProjectURL_ = projectURL;
-      }
-
-      return status;
-    }
-    catch (Exception e) {
-      status = new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_BAD_SERVER_CONFIG"), Status.ERROR, e);
-      env.getStatusHandler().reportError(status);
-      return status;
-    }
-  }
-
-
-  public void setSampleProject(IProject sampleProject) {
-    sampleProject_ = sampleProject;
-  }
-
-  public void setServiceServerTypeID(String serviceServerTypeID) {
-    serviceServerTypeID_ = serviceServerTypeID;
-  }
-
-  public void setSampleServerTypeID(String sampleServerTypeID) {
-    sampleServerTypeID_ = sampleServerTypeID;
-  }
-
-  public void setServiceExistingServer(IServer serviceExistingServer) {
-    serviceExistingServer_ = serviceExistingServer;
-  }
-
-  public IServer getServiceExistingServer() {
-    return serviceExistingServer_;
-  }
-
-  public String getServiceExistingServerInstId() {
-	String id = null;
-	IServerWorkingCopy wc = null;
-	if (serviceExistingServer_!=null){
-	  wc = serviceExistingServer_.createWorkingCopy();
-	  id = (wc!=null ? wc.getId() : null);
-	}
-	return id;
-  }
-
-  public void setSampleExistingServer(IServer sampleExistingServer) {
-    sampleExistingServer_ = sampleExistingServer;
-  }
-
-  public IServer getSampleExistingServer() {
-    return sampleExistingServer_;
-  }
-
-  public String getSampleExistingServerInstId() {
-	String id = null;
-	IServerWorkingCopy wc = null;
-	if (sampleExistingServer_!=null){
-	  wc = sampleExistingServer_.createWorkingCopy();
-	  id = (wc!=null ? wc.getId() : null);
-	}
-	return id;
-  }
-  
-  public String getServiceProjectURL() {
-    return serviceProjectURL_;
-  }
-
-  public String getSampleProjectURL() {
-    return sampleProjectURL_;
-  }
-  
-  public void setClientTypeRuntimeServer(TypeRuntimeServer trs){
-  	this.clientIds_ = trs;
-  }
-
-  /**
-   * @return Returns the addedProjectToServer_.
-  */
-  public boolean getAddedProjectToServer() {
-    return addedProjectToServer_;
-  }  
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ComputeEndpointCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ComputeEndpointCommand.java
deleted file mode 100644
index 4a4d3bc..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ComputeEndpointCommand.java
+++ /dev/null
@@ -1,130 +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.consumption.command.common;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Iterator;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Port;
-import javax.wsdl.Service;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.soap.SOAPAddress;
-
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.ws.parser.wsil.WebServicesParser;
-
-public class ComputeEndpointCommand extends SimpleCommand
-{
-  private WebServicesParser webServicesParser;
-  private String wsdlURI;
-  private Boolean monitorService;
-  private Integer monitoredPort;
-
-  public ComputeEndpointCommand()
-  {
-    super("org.eclipse.jst.ws.internal.consumption.command.common.ComputeEndpointCommand", "org.eclipse.jst.ws.internal.consumption.command.common.ComputeEndpointCommand");
-  }
-
-  /**
-   * @param monitoredPort The monitoredPort to set.
-   */
-  public void setMonitoredPort(Integer monitoredPort)
-  {
-    this.monitoredPort = monitoredPort;
-  }
-  /**
-   * @param monitorService The monitorService to set.
-   */
-  public void setMonitorService(Boolean monitorService)
-  {
-    this.monitorService = monitorService;
-  }
-  /**
-   * @param webServicesParser The webServicesParser to set.
-   */
-  public void setWebServicesParser(WebServicesParser webServicesParser)
-  {
-    this.webServicesParser = webServicesParser;
-  }
-  /**
-   * @param wsdlURI The wsdlURI to set.
-   */
-  public void setWsdlURI(String wsdlURI)
-  {
-    this.wsdlURI = wsdlURI;
-  }
-  
-  public String getEndpoint()
-  {
-    if (monitorService != null && monitorService.booleanValue() && monitoredPort != null)
-    {
-      Definition def = webServicesParser.getWSDLDefinition(wsdlURI);
-      if (def != null)
-      {
-        for (Iterator it = def.getServices().values().iterator(); it.hasNext();)
-        {
-          Service service = (Service)it.next();
-          for (Iterator it2 = service.getPorts().values().iterator(); it2.hasNext();)
-          {
-            Port port = (Port)it2.next();
-            for (Iterator it3 = port.getExtensibilityElements().iterator(); it3.hasNext();)
-            {
-              ExtensibilityElement ext = (ExtensibilityElement)it3.next();
-              if (ext instanceof SOAPAddress)
-              {
-                String location = ((SOAPAddress)ext).getLocationURI();
-                try
-                {
-                  URL url = new URL(location);
-                  url = new URL(url.getProtocol(), url.getHost(), monitoredPort.intValue(), url.getFile());
-                  return url.toString();
-                }
-                catch (MalformedURLException murle)
-                {
-                  int protocolIndex = location.indexOf("://");
-                  if (protocolIndex != -1)
-                  {
-                    String protocol = location.substring(0, protocolIndex+3);
-                    int hostPortIndex = location.indexOf('/', protocolIndex+3);
-                    String file;
-                    if (hostPortIndex == -1)
-                    {
-                      hostPortIndex = location.length();
-                      file = "";
-                    }
-                    else
-                      file = location.substring(hostPortIndex, location.length());
-                    String hostPort = location.substring(protocolIndex+3, hostPortIndex);
-                    int hostIndex = hostPort.indexOf(':');
-                    String host;
-                    if (hostIndex != -1)
-                      host = hostPort.substring(0, hostIndex+1);
-                    else
-                      host = hostPort + ':';
-                    String newPort = String.valueOf(monitoredPort.intValue());
-                    StringBuffer endpoint = new StringBuffer(protocol);
-                    endpoint.append(host);
-                    endpoint.append(newPort);
-                    endpoint.append(file);
-                    return endpoint.toString();
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-    return null;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CopyWSDLCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CopyWSDLCommand.java
deleted file mode 100644
index 6f13390..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CopyWSDLCommand.java
+++ /dev/null
@@ -1,300 +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.consumption.command.common;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Import;
-import javax.wsdl.Types;
-import javax.wsdl.WSDLException;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.UnknownExtensibilityElement;
-import javax.wsdl.factory.WSDLFactory;
-import javax.wsdl.xml.WSDLWriter;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerConfigurationException;
-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.common.util.EList;
-import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.command.env.core.uri.URIException;
-import org.eclipse.wst.ws.parser.discovery.NetUtils;
-import org.eclipse.wst.ws.parser.wsil.WWWAuthenticationException;
-import org.eclipse.wst.ws.parser.wsil.WebServicesParser;
-import org.eclipse.wst.wsdl.internal.impl.XSDSchemaExtensibilityElementImpl;
-import org.eclipse.wst.wsdl.internal.impl.wsdl4j.WSDLFactoryImpl;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDSchemaDirective;
-import org.eclipse.xsd.impl.XSDSchemaImpl;
-import org.eclipse.xsd.util.XSDParser;
-import org.w3c.dom.Element;
-
-public class CopyWSDLCommand extends SimpleCommand
-{
-  private String wsdlURI;
-  private WebServicesParser webServicesParser;
-  private String destinationURI;
-  private Definition def;
-  private Vector ignoreList;
-
-  public CopyWSDLCommand()
-  {
-    super(WebServiceConsumptionPlugin.getMessage("COMMAND_LABEL_COPY_WSDL"), WebServiceConsumptionPlugin.getMessage("COMMAND_DESC_COPY_WSDL"));
-  }
-
-  /**
-   * Execute the command
-   */
-  public Status execute(Environment env)
-  {
-    try
-    {
-      ignoreList = new Vector();
-      if (def == null)
-        def = webServicesParser.getWSDLDefinition(wsdlURI);
-      copyWSDL(env, wsdlURI, getBaseURI(destinationURI), getLocalname(destinationURI), def);
-      return new SimpleStatus("");
-    }
-    catch (Throwable t)
-    {
-      t.printStackTrace();
-      Status status = new SimpleStatus(WebServiceConsumptionPlugin.ID, WebServiceConsumptionPlugin.getMessage("MSG_ERROR_COPY_WSDL", new String[]{wsdlURI, destinationURI}), Status.ERROR, t);
-      env.getStatusHandler().reportError(status);
-      return status;
-    }
-  }
-
-  private void copyWSDL(Environment env, String uri, String destURI, String destLocalname) throws WSDLException, IOException, WWWAuthenticationException, TransformerException, TransformerConfigurationException, URIException
-  {
-  	Definition definition;
-	
-	try {
-		definition = webServicesParser.getWSDLDefinitionVerbose(uri);
-		copyWSDL(env, uri, destURI, destLocalname, definition);	
-	} catch (WSDLException e) {
-		copyXMLSchema(env, uri, destURI);
-	}
-  }
-
-  private void copyWSDL(Environment env, String uri, String destURI, String destLocalname, Definition definition) throws WSDLException, IOException, WWWAuthenticationException, TransformerException, TransformerConfigurationException, URIException
-  {
-    if (ignoreList.contains(uri))
-      return;
-    ignoreList.add(uri);
-    int index = wsdlURI.lastIndexOf('/');
-    String baseURI = getBaseURI(wsdlURI);
-    if (destLocalname == null || destLocalname.length() <= 0)
-      destLocalname = getLocalname(wsdlURI);
-    // copy WSDL
-    StringBuffer destinationFileURI = new StringBuffer(addTrailingSeparator(destURI));
-    destinationFileURI.append(destLocalname);
-    WSDLFactory wsdlFactory = new WSDLFactoryImpl();
-    WSDLWriter wsdlWriter = wsdlFactory.newWSDLWriter();
-    OutputStream os = env.getURIFactory().newURI(destinationFileURI.toString()).getOutputStream();
-    wsdlWriter.writeWSDL(definition, os);
-    os.close();
-    // copy <wsdl:import>s
-    Map imports = definition.getImports();
-    for (Iterator it = imports.values().iterator(); it.hasNext();)
-    {
-      List list = (List)it.next();
-      for (Iterator listIt = list.iterator(); listIt.hasNext();)
-      {
-        Import wsdlImport = (Import)listIt.next();
-        String wsdlImportURI = wsdlImport.getLocationURI();
-        if (isRelative(wsdlImportURI))
-        {
-          String importBaseURI = (new StringBuffer(baseURI)).append(wsdlImportURI).toString();
-          String wsdlImportBaseURI = getBaseURI(wsdlImportURI);
-          StringBuffer importDestURI = new StringBuffer(destURI);
-          if (wsdlImportBaseURI != null)
-            importDestURI.append(wsdlImportBaseURI);
-          copyWSDL(env, importBaseURI, importDestURI.toString(), getLocalname(wsdlImportURI));
-        }
-      }
-    }
-    Types types = definition.getTypes();
-    if (types != null)
-    {
-      List schemas = types.getExtensibilityElements();
-      for (Iterator it = schemas.iterator(); it.hasNext();)
-      {
-        ExtensibilityElement extElement = (ExtensibilityElement)it.next();
-        if (extElement instanceof UnknownExtensibilityElement)
-        {
-          UnknownExtensibilityElement schemaElement = (UnknownExtensibilityElement)extElement;
-          XSDSchema xsdSchema = null;
-          try
-          {
-            xsdSchema = XSDSchemaImpl.createSchema(schemaElement.getElement());
-          }
-          catch (Throwable t)
-          {
-            // ignore any extensibility elements that cannot be parsed into a
-            // XSDSchema instance
-          }
-          copyXMLSchema(env, xsdSchema, baseURI, destURI);
-        }
-        else if (extElement instanceof XSDSchemaExtensibilityElementImpl)
-        {
-          XSDSchemaExtensibilityElementImpl schemaElement = (XSDSchemaExtensibilityElementImpl)extElement;
-          XSDSchema xsdSchema = null;
-          try
-          {
-            xsdSchema = XSDSchemaImpl.createSchema(schemaElement.getElement());
-          }
-          catch (Throwable t)
-          {
-            // ignore any extensibility elements that cannot be parsed into a
-            // XSDSchema instance
-          }
-          copyXMLSchema(env, xsdSchema, baseURI, destURI);
-        }
-      }
-    }
-  }
-
-  private String getBaseURI(String uri)
-  {
-    int index = uri.lastIndexOf('/');
-    if (index == -1)
-      index = uri.lastIndexOf('\\');
-    if (index != -1)
-      return uri.substring(0, index + 1);
-    else
-      return null;
-  }
-
-  private String getLocalname(String uri)
-  {
-    int index = uri.lastIndexOf('/');
-    if (index == -1)
-      index = uri.lastIndexOf('\\');
-    if (index != -1)
-      return uri.substring(index + 1);
-    else
-      return uri;
-  }
-
-  private String addTrailingSeparator(String s)
-  {
-    if (!(s.endsWith("/") || s.endsWith("\\")))
-    {
-      StringBuffer sb = new StringBuffer(s);
-      sb.append('/');
-      return sb.toString();
-    }
-    else
-      return s;
-  }
-
-  private boolean isRelative(String uri)
-  {
-    return (uri.indexOf(':') == -1);
-  }
-
-  private void copyXMLSchema(Environment env, String uri, String destURI) throws TransformerException, TransformerConfigurationException, IOException, URIException
-  {
-    if (ignoreList.contains(uri))
-      return;
-    ignoreList.add(uri);
-    // load as a cached schema
-    XSDSchema xsdSchema = XSDSchemaImpl.getSchemaForSchema(uri);
-    // if schema is not cached, parse it
-    if (xsdSchema == null)
-    {
-      XSDParser p = new XSDParser();
-      InputStream is = NetUtils.getURLInputStream(uri);
-      if (is != null)
-      {
-        p.parse(is);
-        xsdSchema = p.getSchema();
-      }
-    }
-    if (xsdSchema != null)
-    {
-      // copy schema
-      Element e = xsdSchema.getElement();
-      DOMSource domSource = new DOMSource(e);
-      Transformer serializer = TransformerFactory.newInstance().newTransformer();
-      serializer.setOutputProperty(OutputKeys.INDENT, "yes");
-      serializer.setOutputProperty(OutputKeys.ENCODING, "UTF-8");
-      serializer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "2");
-      OutputStream os = env.getURIFactory().newURI((new StringBuffer(destURI)).append(getLocalname(uri)).toString()).getOutputStream();
-      serializer.transform(domSource, new StreamResult(os));
-      os.close();
-      // copy <xsd:import>s and <xsd:include>s
-      copyXMLSchema(env, xsdSchema, getBaseURI(uri), destURI);
-    }
-  }
-
-  private void copyXMLSchema(Environment env, XSDSchema xsdSchema, String baseURI, String destURI) throws TransformerException, TransformerConfigurationException, IOException, URIException
-  {
-    if (xsdSchema != null)
-    {
-      // copy <xsd:import>s and <xsd:include>s
-      EList xsdSchemaContents = xsdSchema.getContents();
-      for (Iterator it = xsdSchemaContents.iterator(); it.hasNext();)
-      {
-        Object content = it.next();
-        if (content instanceof XSDSchemaDirective)
-        {
-          XSDSchemaDirective xsdSchemaDirective = (XSDSchemaDirective)content;
-          String xsdSchemaDirectiveLocation = xsdSchemaDirective.getSchemaLocation();
-          if (xsdSchemaDirectiveLocation != null && isRelative(xsdSchemaDirectiveLocation))
-          {
-            String directiveURI = (new StringBuffer(baseURI)).append(xsdSchemaDirectiveLocation).toString();
-            String directiveBaseURI = getBaseURI(xsdSchemaDirectiveLocation);
-            StringBuffer directiveDestURI = new StringBuffer(destURI);
-            if (directiveBaseURI != null)
-              directiveDestURI.append(directiveBaseURI);
-            copyXMLSchema(env, directiveURI, directiveDestURI.toString());
-          }
-        }
-      }
-    }
-  }
-
-  public void setWsdlURI(String wsdlURI)
-  {
-    this.wsdlURI = wsdlURI;
-  }
-
-  public void setWebServicesParser(WebServicesParser webServicesParser)
-  {
-    this.webServicesParser = webServicesParser;
-  }
-
-  public void setDestinationURI(String destinationURI)
-  {
-    this.destinationURI = destinationURI;
-  }
-
-  public void setDefinition(Definition def)
-  {
-    this.def = def;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateAppClientProjectCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateAppClientProjectCommand.java
deleted file mode 100644
index fadc603..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateAppClientProjectCommand.java
+++ /dev/null
@@ -1,146 +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.consumption.command.common;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jst.j2ee.application.internal.operations.J2EEComponentCreationDataModel;
-import org.eclipse.jst.j2ee.applicationclient.internal.creation.AppClientComponentCreationDataModel;
-import org.eclipse.jst.j2ee.applicationclient.internal.creation.AppClientComponentCreationOperation;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.earcreation.EARNatureRuntime;
-import org.eclipse.jst.j2ee.internal.servertarget.IServerTargetConstants;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-
-public class CreateAppClientProjectCommand extends SimpleCommand
-{
-  private String appClientProjectName_;
-  private String earProjectName_;
-  private String serverFactoryId_;
-  private String j2eeVersion_;  
-  
-
-  /**
-   * Constructor
-   */
-  public CreateAppClientProjectCommand()
-  {
-    super("org.eclipse.jst.ws.internal.consumption.command.common.CreateAppClientProjectCommand", "org.eclipse.jst.ws.internal.consumption.command.common.CreateAppClientProjectCommand");
-    //setRunInWorkspaceModifyOperation(false);
-  }
-
-  public Status execute(Environment env)
-  {
-	MessageUtils msgUtils_ = new MessageUtils( "org.eclipse.jst.ws.consumption.plugin", this );
-	
-    try
-    {
-      IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-      IProject earProject = root.getProject(earProjectName_);
-      if (earProject != null && !earProject.exists())
-      {
-        CreateEARProjectCommand c = new CreateEARProjectCommand();
-        c.setEarProjectName(earProjectName_);
-        c.setServerFactoryId(serverFactoryId_);
-        c.setJ2EEVersion(j2eeVersion_);
-        c.execute(env);
-        earProject = root.getProject(earProjectName_);
-      }
-      IProject appClientProject = root.getProject(appClientProjectName_);
-      if (appClientProject != null && !appClientProject.exists())
-      {
-        AppClientComponentCreationDataModel info = new AppClientComponentCreationDataModel();
-        info.setProperty(AppClientComponentCreationDataModel.COMPONENT_NAME, appClientProjectName_);
-        info.setProperty(AppClientComponentCreationDataModel.EAR_MODULE_NAME, earProjectName_);
-        info.setProperty(AppClientComponentCreationDataModel.ADD_TO_EAR, Boolean.TRUE);
-        
-        //Set the J2EE version
-        String finalJ2EEVersion = null;
-        if (j2eeVersion_ != null && j2eeVersion_.length()>0)
-        {
-          info.setProperty(AppClientComponentCreationDataModel.J2EE_VERSION, new Integer(j2eeVersion_));
-          finalJ2EEVersion = j2eeVersion_;
-        }                        
-        else
-        {
-          if (earProject != null && earProject.exists())
-          {
-            EARNatureRuntime ear = EARNatureRuntime.getRuntime(earProject);
-            int earVersion = ear.getJ2EEVersion();
-            info.setProperty(AppClientComponentCreationDataModel.J2EE_VERSION, new Integer(earVersion));
-            finalJ2EEVersion = String.valueOf(earVersion);
-          }
-          else
-          {
-            info.setProperty(AppClientComponentCreationDataModel.J2EE_VERSION, new Integer(J2EEVersionConstants.J2EE_1_3_ID));
-            finalJ2EEVersion = String.valueOf(J2EEVersionConstants.J2EE_1_3_ID);
-          }            
-        }        
-        
-        //Set the server target
-        if (serverFactoryId_!=null && serverFactoryId_.length()>0)
-        {
-		//TODO - Add this logic to FlexibleProjectCreationDataModel, and op....
-		
-//          String runtimeTargetId = ServerUtils.getServerTargetIdFromFactoryId(serverFactoryId_, IServerTargetConstants.APP_CLIENT_TYPE, finalJ2EEVersion); 
-//		  info.setProperty(AppClientComponentCreationDataModel.SERVER_TARGET_ID, runtimeTargetId );
-//          info.setProperty(AppClientComponentCreationDataModel.ADD_SERVER_TARGET, Boolean.TRUE);
-        }
-
-        //Create the AppClient project
-        AppClientComponentCreationOperation operation = new AppClientComponentCreationOperation(info);
-        operation.run(new NullProgressMonitor());
-      }
-    }
-    catch (java.lang.reflect.InvocationTargetException ite)
-    {
-      Status status = new SimpleStatus(WebServiceConsumptionPlugin.ID, msgUtils_.getMessage("MSG_ERROR_CANNOT_CREATE_APP_CLIENT_PROJECT", new String[] {appClientProjectName_}), Status.ERROR, ite);
-      env.getStatusHandler().reportError(status);
-      return status;
-    }
-    catch (InterruptedException ie)
-    {
-      Status status = new SimpleStatus(WebServiceConsumptionPlugin.ID, msgUtils_.getMessage("MSG_ERROR_CANNOT_CREATE_APP_CLIENT_PROJECT", new String[] {appClientProjectName_}), Status.ERROR, ie);
-      env.getStatusHandler().reportError(status);
-      return status;
-    }
-    return new SimpleStatus("");
-  }
-  
-  public void setAppClientProjectName(String appClientProjectName)
-  {
-    appClientProjectName_ = appClientProjectName;
-  }
-  
-  public void setEarProjectName(String earProjectName)
-  {
-    earProjectName_ = earProjectName;
-  }
-  
-  public void setServerFactoryId(String serverFactoryId)
-  {
-  	serverFactoryId_ = serverFactoryId;
-  }
-  
-  public void setJ2EEVersion(String j2eeVersion)
-  {
-  	j2eeVersion_ = j2eeVersion;	
-  }  
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateClientProjectCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateClientProjectCommand.java
deleted file mode 100644
index 6ca45b8..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateClientProjectCommand.java
+++ /dev/null
@@ -1,265 +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.consumption.command.common;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.ws.internal.common.EnvironmentUtils;
-import org.eclipse.jst.ws.internal.consumption.common.WebServiceStartServerRegistry;
-import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.Log;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.IServerWorkingCopy;
-import org.eclipse.wst.server.core.ServerCore;
-
-public class CreateClientProjectCommand extends SimpleCommand
-{
-  private String ID_WEB = "org.eclipse.jst.ws.consumption.ui.clientProjectType.Web";
-  private String ID_EJB = "org.eclipse.jst.ws.consumption.ui.clientProjectType.EJB";
-  private String ID_APP_CLIENT = "org.eclipse.jst.ws.consumption.ui.clientProjectType.AppClient";
-  private String ID_JAVA = "org.eclipse.jst.ws.consumption.ui.clientProjectType.Containerless";
-
-  private boolean proxyCodegenEnabled = true;
-  private String clientProjectTypeId;
-  private IProject proxyProject;
-  private IProject proxyProjectEAR;
-  private String existingServerId_;
-  private String serverFactoryId_;
-  private String j2eeVersion_;
-  private boolean needEAR_;
-  private boolean addedProjectToServer_ = false;
-
-  private IServer fExistingServer = null;
-  private MessageUtils msgUtils_;
-  
-  /**
-   * Default CTOR
-   */
-  public CreateClientProjectCommand()
-  {
-    super("org.eclipse.jst.ws.internal.consumption.command.common.CreateClientProjectCommand", "org.eclipse.jst.ws.internal.consumption.command.common.CreateClientProjectCommand");
-    String       pluginId = "org.eclipse.jst.ws.consumption";
-    msgUtils_ = new MessageUtils( pluginId + ".plugin", this );    
-  }
-
-  public boolean isUndoable(){
-  	return true;
-  }
-
-  public Status undo(Environment env){
-  	Status stat = new SimpleStatus("");
-    try	{
-    	
-      // check existingServer
-      if (fExistingServer!=null) {
-	    	
-    	AbstractStartServer startServerCommand = null;
-    	WebServiceStartServerRegistry reg = WebServiceStartServerRegistry.getInstance();
-    	startServerCommand = (AbstractStartServer)reg.getServerStartByTypeId(fExistingServer.getServerType().getId());
-    	if (proxyProjectEAR!=null) {
-    		startServerCommand.runPostServerConfig(fExistingServer, proxyProjectEAR);
-    	}
-      }
-   	}
-    catch (CoreException ce ) {
-      IStatus embeddedStatus = ce.getStatus();
-      stat = EnvironmentUtils.convertIStatusToStatus(embeddedStatus);
-      env.getStatusHandler().reportError(stat);
-  		return stat;
-  	}  	
-  	
-  	return stat;
-  }  
-  
-  public Status execute(Environment env)
-  {
-  	Status status = new SimpleStatus("");
-  	//Get the existing server
-
-    IServer[] servers = ServerCore.getServers();
-    IServer existingServer = null;
-	fExistingServer = null;    
-    for (int i=0; i<servers.length; i++)
-    {
-      IServer thisServer = (IServer)servers[i];
-      IServerWorkingCopy wc = null;
-      String thisServerId = null;
-      if (thisServer!=null) {
-      	wc = thisServer.createWorkingCopy();
-      	thisServerId = (wc!=null ? wc.getId() : null);
-      }
-      if (thisServerId.equals(existingServerId_)){
-        existingServer = thisServer;
-        fExistingServer = existingServer;
-      }
-    } 
-    
-    //Create the project
-    if (proxyCodegenEnabled)
-    {
-      if (clientProjectTypeId == null || clientProjectTypeId.length() <= 0)
-        clientProjectTypeId = (WebServicePlugin.getInstance().getProjectTopologyContext().getClientTypes())[0];
-      if (ID_WEB.equals(clientProjectTypeId))
-      {  
-        CreateWebProjectCommand c = new CreateWebProjectCommand();
-        c.setProjectName(proxyProject.getName());
-        
-        if (proxyProjectEAR != null)
-          c.setEarProjectName(proxyProjectEAR.getName());
-        else
-          c.setEarProjectName("");
-        
-        c.setServerFactoryId(serverFactoryId_);
-        c.setJ2EEVersion(j2eeVersion_);            
-        c.setExistingServer(existingServer);
-        c.setNeedEAR(needEAR_);
-        c.setAddedProjectToServer(addedProjectToServer_);
-        
-        status = c.execute(env);
-        if (status.getSeverity()==Status.ERROR){
-      	return status;
-      }
-      
-      Status startServerStatus = startServer(env, proxyProject);
-      if (startServerStatus.getSeverity()==Status.ERROR)
-      	return startServerStatus;
-        
-      }
-      else if (ID_EJB.equals(clientProjectTypeId))
-      {
-        CreateEJBProjectCommand c = new CreateEJBProjectCommand();
-        c.setEjbProjectName(proxyProject.getName());
-        c.setEarProjectName(proxyProjectEAR.getName());
-        c.setServerFactoryId(serverFactoryId_);
-        c.setJ2EEVersion(j2eeVersion_);
-        status = c.execute(env);
-      }
-      else if (ID_APP_CLIENT.equals(clientProjectTypeId))
-      {
-        CreateAppClientProjectCommand c = new CreateAppClientProjectCommand();
-        c.setAppClientProjectName(proxyProject.getName());
-        c.setEarProjectName(proxyProjectEAR.getName());
-        c.setServerFactoryId(serverFactoryId_);
-        c.setJ2EEVersion(j2eeVersion_);
-        status = c.execute(env);
-      }
-      else if (ID_JAVA.equals(clientProjectTypeId))
-      {
-        CreateJavaProjectCommand c = new CreateJavaProjectCommand();
-        c.setProjectName(proxyProject.getName());
-        status = c.execute(env);
-      }
-         
-    }
-
-    try	{
-    	
-   		AbstractStartServer startServerCommand = null;
-   		WebServiceStartServerRegistry reg = WebServiceStartServerRegistry.getInstance();
-     	startServerCommand = (AbstractStartServer)reg.getServerStartByTypeId(existingServer.getServerType().getId());
-     	if (proxyProjectEAR!=null && existingServer!=null) {
-     		startServerCommand.runPreServerConfig(existingServer, proxyProjectEAR);
-     		fExistingServer = existingServer;
-     	}
-   	}
-    catch (CoreException ce ) {
-    	IStatus embeddedStatus = ce.getStatus();
-    	status = EnvironmentUtils.convertIStatusToStatus(embeddedStatus);
-    	env.getStatusHandler().reportError(status);
-  		return status;
-  	}
-  	
-  	return status;   
-    
-  }
-  
-  private Status startServer(Environment env, IProject webProject){
-  	try{
-  	    // start server(Bug 4377)
-  	    if (needEAR_ &&  fExistingServer != null){
-  	    	StartProjectCommand spc = new StartProjectCommand();
-  	    	spc.setSampleProject(webProject);
-  	    	spc.setSampleExistingServer(fExistingServer);
-  	    	spc.setCreationScenario(new Boolean("false"));
-  	    	return spc.execute(env);	    	
-  	    	
-  	    }  		
-  	}
-  	catch(Exception ce){
-        env.getLog().log(Log.ERROR, 5046, this, "execute", ce);
-        Status status = new SimpleStatus(WebServiceConsumptionPlugin.ID, msgUtils_.getMessage("MSG_ERROR_WEB_PROJECT_CREATE"), Status.ERROR, ce);
-        env.getStatusHandler().reportError(status);
-        return status;		
-  	}
-  	return new SimpleStatus("");
-  }   
-  
-  public void setProxyCodegenEnabled(boolean proxyCodegenEnabled)
-  {
-    this.proxyCodegenEnabled = proxyCodegenEnabled;
-  }
-
-  /**
-   * @param proxyProjectEAR The proxyProjectEAR to set.
-   */
-  public void setProxyProjectEAR(IProject proxyProjectEAR)
-  {
-    this.proxyProjectEAR = proxyProjectEAR;
-  }
-
-  /**
-   * @param proxyProject The proxyProject to set.
-   */
-  public void setProxyProject(IProject proxyProject)
-  {
-    this.proxyProject = proxyProject;
-  }
-
-  /**
-   * @param clientProjectTypeId The clientProjectTypeId to set.
-   */
-  public void setClientProjectTypeId(String clientProjectTypeId)
-  {
-    this.clientProjectTypeId = clientProjectTypeId;
-  }
-  
-  public void setServerFactoryId(String serverFactoryId)
-  {
-  	serverFactoryId_ = serverFactoryId;
-  }
-  
-  public void setJ2EEVersion(String j2eeVersion)
-  {
-  	j2eeVersion_ = j2eeVersion;	
-  }  
-  
-  public void setNeedEAR(boolean needEAR)
-  {
-    needEAR_ = needEAR;
-  }    
-  
-  public void setExistingServerId(String existingServerId)
-  {
-    existingServerId_ = existingServerId;
-  }
-  
-  public void setAddedProjectToServer(boolean addedProjectToServer) 
-  {
-    addedProjectToServer_ = addedProjectToServer;
-  }   
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateEARProjectCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateEARProjectCommand.java
deleted file mode 100644
index cabcea6..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateEARProjectCommand.java
+++ /dev/null
@@ -1,115 +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.consumption.command.common;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jst.j2ee.application.internal.operations.EARComponentCreationOperation;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.earcreation.EARComponentCreationDataModel;
-import org.eclipse.jst.j2ee.internal.servertarget.IServerTargetConstants;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-
-
-public class CreateEARProjectCommand extends SimpleCommand
-{
-  private String earProjectName_;
-  private String serverFactoryId_;
-  private String j2eeVersion_;  
-
-  /**
-   * Constructor
-   */
-  public CreateEARProjectCommand()
-  {
-    super("org.eclipse.jst.ws.internal.consumption.command.common.CreateEARProjectCommand", "org.eclipse.jst.ws.internal.consumption.command.common.CreateEARProjectCommand");
-    //setRunInWorkspaceModifyOperation(false);
-  }
-
-  public Status execute(Environment env)
-  {
-	MessageUtils msgUtils_ = new MessageUtils( "org.eclipse.jst.ws.consumption.plugin", this );
-	
-    try
-    {
-      IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(earProjectName_);
-      if (project != null && !project.exists())
-      {
-        EARComponentCreationDataModel info = new EARComponentCreationDataModel();
-        info.setProperty(EARComponentCreationDataModel.PROJECT_NAME, project.getName());
-        
-        //Set the J2EE version
-        String finalJ2EEVersion = null;
-        if (j2eeVersion_ != null && j2eeVersion_.length()>0)
-        {
-          info.setProperty(EARComponentCreationDataModel.COMPONENT_VERSION, new Integer(j2eeVersion_));
-          finalJ2EEVersion = j2eeVersion_;
-        }
-        else
-        {
-          info.setProperty(EARComponentCreationDataModel.COMPONENT_VERSION, new Integer(J2EEVersionConstants.J2EE_1_3_ID));
-          finalJ2EEVersion = String.valueOf(J2EEVersionConstants.J2EE_1_3_ID);
-        }
-        
-        //Set the server target
-        if (serverFactoryId_!=null && serverFactoryId_.length()>0)
-        {
-//			TODO - Add this logic to FlexibleProjectCreationDataModel, and op....
-//          String runtimeTargetId = ServerUtils.getServerTargetIdFromFactoryId(serverFactoryId_, IServerTargetConstants.EAR_TYPE, finalJ2EEVersion); 
-//          info.setProperty(EARComponentCreationDataModel.SERVER_TARGET_ID, runtimeTargetId );
-//          info.setProperty(EARComponentCreationDataModel.ADD_SERVER_TARGET, Boolean.TRUE);
-        }
-
-        //Create the EAR
-        EARComponentCreationOperation operation = new EARComponentCreationOperation(info);
-        operation.run(new NullProgressMonitor());
-      }
-    }
-    catch (java.lang.reflect.InvocationTargetException ite)
-    {
-      Status status = new SimpleStatus(WebServiceConsumptionPlugin.ID, msgUtils_.getMessage("MSG_ERROR_CANNOT_CREATE_EAR_PROJECT", new String[] {earProjectName_}), Status.ERROR, ite);
-      env.getStatusHandler().reportError(status);
-      return status;
-    }
-    catch (InterruptedException ie)
-    {
-      Status status = new SimpleStatus(WebServiceConsumptionPlugin.ID, msgUtils_.getMessage("MSG_ERROR_CANNOT_CREATE_EAR_PROJECT", new String[] {earProjectName_}), Status.ERROR, ie);
-      env.getStatusHandler().reportError(status);
-      return status;
-    }
-    return new SimpleStatus("");
-  }
-  /**
-   * @param earProjectName_ The earProjectName_ to set.
-   */
-  public void setEarProjectName(String earProjectName)
-  {
-    this.earProjectName_ = earProjectName;
-  }
-
-  public void setServerFactoryId(String serverFactoryId)
-  {
-  	serverFactoryId_ = serverFactoryId;
-  }
-  
-  public void setJ2EEVersion(String j2eeVersion)
-  {
-  	j2eeVersion_ = j2eeVersion;	
-  }  
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateEJBProjectCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateEJBProjectCommand.java
deleted file mode 100644
index a6935b7..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateEJBProjectCommand.java
+++ /dev/null
@@ -1,421 +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.consumption.command.common;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.earcreation.EARNatureRuntime;
-import org.eclipse.jst.j2ee.internal.ejb.archiveoperations.EjbComponentCreationDataModel;
-import org.eclipse.jst.j2ee.internal.ejb.archiveoperations.EjbComponentCreationOperation;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.servertarget.IServerTargetConstants;
-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.plugin.WebServiceConsumptionPlugin;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerUtil;
-
-
-public class CreateEJBProjectCommand extends SimpleCommand
-{
-  private static String LABEL = "%TASK_LABEL_CREATE_EJB_PROJECT";
-  private static String DESCRIPTION = "%TASK_DESC_CREATE_EJB_PROJECT";
-  private boolean isEJBProjectRequired_ = true;
-  private String ejbProjectName_ = null;
-  private String earProjectName_ = null;
-  
-  private IProject serviceProject;
-  private IServer serviceExistingServer;
-  private String serverFactoryId_;
-  private String j2eeVersion_;  
-  
- 
-  public CreateEJBProjectCommand()
-  {
-    super(LABEL, DESCRIPTION);
-  }
-
-  /**
-   * Constructor for CreateEJBProjectTask.
-   * @param arg0
-   * @param arg1
-   */
-  public CreateEJBProjectCommand(String label, String desc)
-  {
-    super(label, desc);
-    //setRunInWorkspaceModifyOperation(false);
-  }
-
-  public Status execute(Environment env)
-  {
-   try
-   {
-    if (ejbProjectName_ != null && ejbProjectName_.length() > 0 && earProjectName_ != null && earProjectName_.length() > 0)
-    {
-      Status status = createEJBProject(ejbProjectName_, earProjectName_, env);
-      if (status.getSeverity() == Status.ERROR) 
-        env.getStatusHandler().reportError(status);
-      return status;
-      
-    }
-
-    // Get web project and form ejbProjectName
-    if (!isEJBProjectRequired_)
-      return new SimpleStatus("");
-    
-    if (ejbProjectName_ == null)
-      return new SimpleStatus("");
-    
-    // EJB Project already exists
-    IContainer container = J2EEPlugin.getWorkspace().getRoot().getProject(ejbProjectName_);
-    if (container.exists())
-    {
-      return new SimpleStatus("");
-    }
-
-    // Create EJBProjectInfo
-    EjbComponentCreationDataModel projectInfo = new EjbComponentCreationDataModel();
-    projectInfo.setProperty( EjbComponentCreationDataModel.PROJECT_NAME, ejbProjectName_ );
-    projectInfo.setProperty(EjbComponentCreationDataModel.CREATE_DEFAULT_SESSION_BEAN,Boolean.TRUE);
-
-    Status status;
-    if (earProjectName_ != null)
-      status = addEARToProject(earProjectName_, projectInfo);
-    else
-    {
-      status = addEARToProject(serviceProject, projectInfo, env);
-    }
-    if (status.getSeverity() == Status.ERROR)
-      env.getStatusHandler().reportError(status);
-    return status;
-   }
-   catch (Exception e) {
-   }
-   return new SimpleStatus("");
-  }
-
-  private Status addEARToProject(String earProjectName, EjbComponentCreationDataModel projectInfo)
-  {
-    IProject earProject = null;
-    // IProject earProject = ResourcesPlugin.getWorkspace().getRoot().getProject(earProjectName);
-    // if (!earProject.exists())
-    {    	
-      EARNatureRuntime ear = null;
-      if (j2eeVersion_!=null && j2eeVersion_.length()>0)
-      {
-      	ear = J2EEUtils.getEAR(Integer.parseInt(j2eeVersion_));
-      }
-      else
-      {
-        ear = J2EEUtils.get13EAR();      
-        if (ear != null)
-          earProject = ear.getProject();
-        else
-        {
-          ear = J2EEUtils.get12EAR();
-          if (ear != null)
-            earProject = ear.getProject();
-        }
-      }
-    }
-
-    projectInfo.setProperty(EjbComponentCreationDataModel.EAR_MODULE_NAME, earProject.getName());
-    projectInfo.setProperty(EjbComponentCreationDataModel.ADD_TO_EAR, Boolean.TRUE);
-    
-    //Set the J2EE version
-    String finalJ2EEVersion = null;    
-    if (j2eeVersion_ != null && j2eeVersion_.length()>0)
-    {
-      projectInfo.setProperty(EjbComponentCreationDataModel.J2EE_VERSION, new Integer(j2eeVersion_));
-      finalJ2EEVersion = j2eeVersion_;
-    }    
-    else
-    {
-      if (earProject != null && earProject.exists())
-      {
-        EARNatureRuntime ear = EARNatureRuntime.getRuntime(earProject);
-        int earVersion = ear.getJ2EEVersion();
-        projectInfo.setProperty(EjbComponentCreationDataModel.J2EE_VERSION, new Integer(earVersion));
-        finalJ2EEVersion = String.valueOf(earVersion);
-      }
-      else
-      {
-        projectInfo.setProperty(EjbComponentCreationDataModel.J2EE_VERSION, new Integer(J2EEVersionConstants.J2EE_1_3_ID));
-        finalJ2EEVersion = String.valueOf(J2EEVersionConstants.J2EE_1_3_ID);
-      }            
-    }
-    
-    if (serverFactoryId_!=null && serverFactoryId_.length()>0)
-    {
-		//		TODO - Add this logic to FlexibleProjectCreationDataModel, and op....
-//      String runtimeTargetId = ServerUtils.getServerTargetIdFromFactoryId(serverFactoryId_, IServerTargetConstants.EJB_TYPE, j2eeVersion_); 
-//      projectInfo.setProperty(EjbComponentCreationDataModel.SERVER_TARGET_ID, runtimeTargetId );
-//      projectInfo.setProperty(EjbComponentCreationDataModel.ADD_SERVER_TARGET, Boolean.TRUE);
-    }
-
-    EjbComponentCreationOperation ejbProjectCreationOperation = new EjbComponentCreationOperation(projectInfo);    	
-
-    try
-    {
-      ejbProjectCreationOperation.run(new NullProgressMonitor());
-	  
-    }
-    catch (java.lang.reflect.InvocationTargetException e)
-    {
-      return new SimpleStatus(WebServiceConsumptionPlugin.ID, WebServiceConsumptionPlugin.getMessage("%MSG_ERROR_CANNOT_CREATE_EJB_PROJECT"), Status.ERROR, e);
-    }
-    catch (InterruptedException ex)
-    {
-      return new SimpleStatus(WebServiceConsumptionPlugin.ID, WebServiceConsumptionPlugin.getMessage("%MSG_ERROR_CANNOT_CREATE_EJB_PROJECT"), Status.ERROR, ex);
-    }
-    return new SimpleStatus("");
-  }
-
-  private Status addEARToProject(IProject serviceProject, EjbComponentCreationDataModel projectInfo, Environment env)
-  {
-        EARNatureRuntime ear = null;
-        IProject earProject = null;
-        boolean addServiceEARToServer = false;
-        boolean addDiscoveredEARToServer = false;
-        IServer discoveredEARsServer = null;
-        EARNatureRuntime[] ears = J2EEUtils.getEARProjects(serviceProject);
-        try {    	
-      
-	    if (ears!=null && ears.length >= 1) {
-	      ear = ears[0];      
-             earProject = ear.getProject();
-             if (serviceExistingServer != null)
-             {
-               if (serviceExistingServer.getServerState() != IServer.STATE_STOPPED)
-                 serviceExistingServer.synchronousStop(false);     
-               Status mmStatus = ServerUtils.getInstance().modifyModules(env, serviceExistingServer, ResourceUtils.getModule(earProject), false, new NullProgressMonitor());
-               if (mmStatus.getSeverity()==Status.ERROR)
-               	return mmStatus;
-               addServiceEARToServer = true;
-             }
-
-	    }
-	    else {
-	      //Check to see if any eligible EARs exist in the workspace.
-	      ear = J2EEUtils.get12EAR();
-	      if (ear!=null)
-	      {
-	      	earProject = ear.getProject();
-
-	      	// Add default server
-              IServer defaultServer = ServerUtils.getDefaultExistingServer(earProject);    
-              if (defaultServer!=null)
-              {
-              	if (defaultServer.getServerState() != IServer.STATE_STOPPED) {
-                	 defaultServer.synchronousStop(false);                    
-                	 }
-              	Status mmStatus = ServerUtils.getInstance().modifyModules(env, defaultServer, ResourceUtils.getModule(earProject), false, new NullProgressMonitor());
-                if (mmStatus.getSeverity()==Status.ERROR)
-                   	return mmStatus;              	
-			addDiscoveredEARToServer = true;
-			discoveredEARsServer = defaultServer;			
-               }
-	       }
-	    }
-	    
-        }
-        catch (Exception e)
-        {
-          return new SimpleStatus(WebServiceConsumptionPlugin.ID, WebServiceConsumptionPlugin.getMessage("%MSG_ERROR_CANNOT_CREATE_EJB_PROJECT"), Status.ERROR, e);
-        }
-	      
-      IProject ejbProject = null;
-      //Add the project back to the Server config
-      projectInfo.setProperty(EjbComponentCreationDataModel.EAR_MODULE_NAME, earProject.getName());
-      projectInfo.setProperty(EjbComponentCreationDataModel.ADD_TO_EAR, Boolean.TRUE);	
-      EjbComponentCreationOperation ejbProjectCreationOperation = new EjbComponentCreationOperation(projectInfo);    	
-
-      try {
-        ejbProjectCreationOperation.run(new NullProgressMonitor());
-      }
-      catch (java.lang.reflect.InvocationTargetException e)
-      {
-        return new SimpleStatus(WebServiceConsumptionPlugin.ID, WebServiceConsumptionPlugin.getMessage("%MSG_ERROR_CANNOT_CREATE_EJB_PROJECT"), Status.ERROR, e);
-      }
-      catch (InterruptedException ex)
-      {
-        return new SimpleStatus(WebServiceConsumptionPlugin.ID, WebServiceConsumptionPlugin.getMessage("%MSG_ERROR_CANNOT_CREATE_EJB_PROJECT"), Status.ERROR, ex);    
-      } 
-
-      //ejbProject = projectInfo.primGetProject();
-
-      //Add the project back to the Server config
-      if (addServiceEARToServer)
-      {
-      	Status mmStatus = ServerUtils.getInstance().modifyModules(env, serviceExistingServer, ResourceUtils.getModule(earProject), true, new NullProgressMonitor());
-        if (mmStatus.getSeverity()==Status.ERROR)
-           	return mmStatus;  
-      }
-      if (addDiscoveredEARToServer)
-      {
-      	Status mmStatus = ServerUtils.getInstance().modifyModules(env, discoveredEARsServer, ResourceUtils.getModule(earProject), true, new NullProgressMonitor());
-        if (mmStatus.getSeverity()==Status.ERROR)
-           	return mmStatus;  
-      }
-      return new SimpleStatus("");
-  }
-
-  private Status createEJBProject(String ejbProjectName, String earProjectName, Environment env)
-  {
-    try
-    {
-      IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-      IProject earProject = root.getProject(earProjectName);
-      if (earProject != null && !earProject.exists())
-      {
-        CreateEARProjectCommand c = new CreateEARProjectCommand();
-        c.setEarProjectName(earProjectName);
-        c.setServerFactoryId(serverFactoryId_);
-        c.setJ2EEVersion(j2eeVersion_);
-        c.execute(env);
-        earProject = root.getProject(earProjectName);
-      }
-      IProject ejbProject = root.getProject(ejbProjectName);
-      if (ejbProject != null && !ejbProject.exists())
-      {
-        EjbComponentCreationDataModel info = new EjbComponentCreationDataModel();
-        info.setProperty(EjbComponentCreationDataModel.PROJECT_NAME, ejbProjectName);
-        info.setProperty(EjbComponentCreationDataModel.EAR_MODULE_NAME, earProjectName);
-        info.setProperty(EjbComponentCreationDataModel.ADD_TO_EAR, Boolean.TRUE);
-        
-        info.setProperty(EjbComponentCreationDataModel.CREATE_DEFAULT_SESSION_BEAN,Boolean.TRUE);        
-        
-        //Set the J2EE version
-        String finalJ2EEVersion = null;
-        if (j2eeVersion_ != null && j2eeVersion_.length()>0)
-        {
-          info.setProperty(EjbComponentCreationDataModel.J2EE_VERSION, new Integer(j2eeVersion_));
-          finalJ2EEVersion = j2eeVersion_;
-        }                                
-        else
-        {
-          if (earProject != null && earProject.exists())
-          {
-            EARNatureRuntime ear = EARNatureRuntime.getRuntime(earProject);
-            int earVersion = ear.getJ2EEVersion();
-            info.setProperty(EjbComponentCreationDataModel.J2EE_VERSION, new Integer(earVersion));
-            finalJ2EEVersion = String.valueOf(earVersion);
-          }
-          else
-          {
-            info.setProperty(EjbComponentCreationDataModel.J2EE_VERSION, new Integer(J2EEVersionConstants.J2EE_1_3_ID));
-            finalJ2EEVersion = String.valueOf(J2EEVersionConstants.J2EE_1_3_ID);
-          }            
-        }
-        
-        //Set the server target
-        if (serverFactoryId_!=null && serverFactoryId_.length()>0)
-        {
-//			TODO - Add this logic to FlexibleProjectCreationDataModel, and op....
-//          String runtimeTargetId = ServerUtils.getServerTargetIdFromFactoryId(serverFactoryId_,IServerTargetConstants.EJB_TYPE, finalJ2EEVersion); 
-//          info.setProperty(EjbComponentCreationDataModel.SERVER_TARGET_ID, runtimeTargetId );
-//          info.setProperty(EjbComponentCreationDataModel.ADD_SERVER_TARGET, Boolean.TRUE);
-        }
-
-        //Create the EJB Project
-        EjbComponentCreationOperation operation = new EjbComponentCreationOperation(info);
-        operation.run(new NullProgressMonitor());
-      }
-      
-      // add EAR to Server
-      if (serviceExistingServer!=null){
-        boolean earAddedToServer = ServerUtil.containsModule(serviceExistingServer,ResourceUtils.getModule(earProject), new NullProgressMonitor());
-        
-        if (!earAddedToServer) {
-          Status mmStatus = ServerUtils.getInstance().modifyModules(env, serviceExistingServer, ResourceUtils.getModule(earProject) , true, new NullProgressMonitor());  
-          if (mmStatus.getSeverity()==Status.ERROR)
-          	return mmStatus;      
-        }        
-      }
-      
-      
-    }
-    catch (java.lang.reflect.InvocationTargetException ite)
-    {
-      return new SimpleStatus(WebServiceConsumptionPlugin.ID, WebServiceConsumptionPlugin.getMessage("%MSG_ERROR_CANNOT_CREATE_EJB_PROJECT"), Status.ERROR, ite);
-    }
-    catch (InterruptedException ie)
-    {
-      return new SimpleStatus(WebServiceConsumptionPlugin.ID, WebServiceConsumptionPlugin.getMessage("%MSG_ERROR_CANNOT_CREATE_EJB_PROJECT"), Status.ERROR, ie);
-    }
-    return new SimpleStatus("");
-  }
-  
-  /**
-   * @param earProjectName The earProjectName to set.
-   */
-  public void setEarProjectName(String earProjectName)
-  {
-    this.earProjectName_ = earProjectName;
-  }
-
-  /**
-   * @param ejbProjectName The ejbProjectName to set.
-   */
-  public void setEjbProjectName(String ejbProjectName)
-  {
-    this.ejbProjectName_ = ejbProjectName;
-  }
-
-  /**
-   * @param isEJBProjectRequired The isEJBProjectRequired to set.
-   */
-  public void setEJBProjectRequired(boolean isEJBProjectRequired)
-  {
-    this.isEJBProjectRequired_ = isEJBProjectRequired;
-  }
-
-  /**
-   * @param ejbProjectName The ejbProjectName to set.
-   */
-  public void setEJBProjectName(String ejbProjectName) {
-    this.ejbProjectName_ = ejbProjectName;
-  }
-
-  /**
-   * @param serviceExistingServer The serviceExistingServer to set.
-   */
-  public void setServiceExistingServer(IServer serviceExistingServer) {
-    this.serviceExistingServer = serviceExistingServer;
-  }
-
-  /**
-   * @param serviceProject The serviceProject to set.
-   */
-  public void setServiceProject(IProject serviceProject) {
-    this.serviceProject = serviceProject;
-  }
-  
-  public void setServerFactoryId(String serverFactoryId)
-  {
-  	serverFactoryId_ = serverFactoryId;
-  }
-  
-  public void setJ2EEVersion(String j2eeVersion)
-  {
-  	j2eeVersion_ = j2eeVersion;	
-  }  
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateJavaProjectCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateJavaProjectCommand.java
deleted file mode 100644
index d31a005..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateJavaProjectCommand.java
+++ /dev/null
@@ -1,80 +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.consumption.command.common;
-
-import org.eclipse.core.resources.ICommand;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-
-
-
-public class CreateJavaProjectCommand extends SimpleCommand
-{
-  private String projectName_;
-
-  /**
-   * Default CTOR
-   */
-  public CreateJavaProjectCommand()
-  {
-    super("org.eclipse.jst.ws.internal.consumption.command.common.CreateJavaProjectCommand", "org.eclipse.jst.ws.internal.consumption.command.common.CreateJavaProjectCommand");
-    //setRunInWorkspaceModifyOperation(false);
-  }
-
-  public Status execute(Environment env)
-  {
-    IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName_);
-    if (project != null && !project.exists())
-    {
-      try
-      {
-        NullProgressMonitor monitor = new NullProgressMonitor();
-        project.create(ResourcesPlugin.getWorkspace().newProjectDescription(project.getName()), monitor);
-        project.open(monitor);
-        IProjectDescription desc = project.getDescription();
-        desc.setNatureIds(new String[] {JavaCore.NATURE_ID});
-        ICommand cmd = desc.newCommand();
-        cmd.setBuilderName(JavaCore.BUILDER_ID);
-        desc.setBuildSpec(new ICommand[] {cmd});
-        project.setDescription(desc, monitor);
-        IJavaProject javaProject = JavaCore.create(project);
-        Path projectRoot = new Path(Path.ROOT.append(new Path(project.getName())).toString());
-        javaProject.setRawClasspath(new IClasspathEntry[] {JavaCore.newSourceEntry(projectRoot), JavaCore.newContainerEntry(new Path(JavaRuntime.JRE_CONTAINER))}, monitor);
-        javaProject.setOutputLocation(projectRoot, monitor);
-      }
-      catch (CoreException ce)
-      {
-        Status status = new SimpleStatus(WebServiceConsumptionPlugin.ID, WebServiceConsumptionPlugin.getMessage("%MSG_ERROR_CANNOT_CREATE_JAVA_PROJECT", new String[] {projectName_}), Status.ERROR, ce);
-        env.getStatusHandler().reportError(status);
-        return status;
-      }
-    }
-    return new SimpleStatus("");
-  }
-  
-  public void setProjectName(String projectName)
-  {
-    projectName_ = projectName;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateModuleCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateModuleCommand.java
deleted file mode 100644
index 374cb13..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateModuleCommand.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.eclipse.jst.ws.internal.consumption.command.common;
-
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-
-public class CreateModuleCommand extends SimpleCommand
-{
-	
-	public static int WEB = 0;
-	public static int EJB = 1;
-	public static int APPCLIENT = 2;
-	public static int EAR = 3;
-	
-	private String projectName;
-	private String moduleName;
-	private int moduleType;;
-	private String j2eeLevel;
-	private String serverFactoryId;
-	
-	public Status execute(Environment env)
-	{
-		//rsk todo
-		return new SimpleStatus("");
-	}
-
-	public void setModuleName(String moduleName)
-	{
-		this.moduleName = moduleName;
-	}	
-
-	public int getModuleType()
-	{
-		return moduleType;
-	}
-
-	public void setModuleType(int moduleType)
-	{
-		this.moduleType = moduleType;
-	}
-
-	public void setProjectName(String projectName)
-	{
-		this.projectName = projectName;
-	}
-
-	public void setJ2eeLevel(String level)
-	{
-		j2eeLevel = level;
-	}
-
-	public void setServerFactoryId(String serverFactoryId)
-	{
-		this.serverFactoryId = serverFactoryId;
-	}
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateMonitorCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateMonitorCommand.java
deleted file mode 100644
index 3651c7e..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateMonitorCommand.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.jst.ws.internal.consumption.command.common;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerPort;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.server.core.internal.IMonitoredServerPort;
-import org.eclipse.wst.server.core.internal.ServerMonitorManager;
-import org.eclipse.wst.server.core.internal.IServerMonitorManager;
-
-public class CreateMonitorCommand extends SimpleCommand {
-
-  private static final String WEB_SERVICES = "Web services";
-
-  private Boolean monitorService;
-
-  private String serviceServerInstanceId;
-
-  private Integer monitoredPort;
-
-  public CreateMonitorCommand() {
-    super("org.eclipse.jst.ws.internal.consumption.command.common.CreateMonitorCommand",
-        "org.eclipse.jst.ws.internal.consumption.command.common.CreateMonitorCommand");
-  }
-
-  public Status execute(Environment env) {
-    if (monitorService != null && monitorService.booleanValue()) {
-      IServer server = ServerCore.findServer(serviceServerInstanceId);
-      if (server != null) {
-
-        // IMonitorableServer monitorableServer = (IMonitorableServer)
-        // serverDelegate;
-        ServerPort[] ports = server.getServerPorts();
-        ServerPort port = null;
-        for (int it = 0; it < ports.length; it++) {
-          ServerPort p = ports[it];
-          String protocol = p.getProtocol();
-          if (protocol != null && protocol.trim().toLowerCase().equals("http")) {
-            port = p;
-            break;
-          }
-        }
-        if (port != null) {
-          IServerMonitorManager serverMonitorManager = ServerMonitorManager.getInstance();
-          IMonitoredServerPort[] monitoredPorts = serverMonitorManager.getMonitoredPorts(server);
-          for (int it2 = 0; it2 < monitoredPorts.length; it2++) {
-            IMonitoredServerPort imsPort = monitoredPorts[it2];
-            if (port.getPort() == imsPort.getServerPort().getPort() && hasContentWebServices(imsPort)) // port
-            // already
-            // being
-            // monitored
-            {
-              if (!imsPort.isStarted()) {
-                try {
-                  serverMonitorManager.startMonitor(imsPort);
-                }
-                catch (CoreException ce) {
-                  MessageUtils msgUtils = new MessageUtils(WebServiceConsumptionPlugin.ID + ".plugin", this);
-                  Status error = new SimpleStatus(WebServiceConsumptionPlugin.ID, msgUtils.getMessage("MSG_ERROR_UNABLE_TO_START_MONITOR",
-                      new Object[] { String.valueOf(port.getPort()), server.getName()}), Status.ERROR, ce);
-                  env.getStatusHandler().reportError(error);
-                  return error;
-                }
-              }
-              monitoredPort = new Integer(imsPort.getMonitorPort());
-              return new SimpleStatus("");
-            }
-          }
-          try {
-            IMonitoredServerPort imsPort = serverMonitorManager.createMonitor(server, port, -1, new String[] { WEB_SERVICES});
-            serverMonitorManager.startMonitor(imsPort);
-            monitoredPort = new Integer(imsPort.getMonitorPort());
-            return new SimpleStatus("");
-          }
-          catch (CoreException ce) {
-            MessageUtils msgUtils = new MessageUtils(WebServiceConsumptionPlugin.ID + ".plugin", this);
-            Status error = new SimpleStatus(WebServiceConsumptionPlugin.ID, msgUtils.getMessage("MSG_ERROR_UNABLE_TO_START_MONITOR", new Object[] {
-                String.valueOf(port.getPort()), server.getName()}), Status.ERROR, ce);
-            env.getStatusHandler().reportError(error);
-            return error;
-          }
-        }
-
-        else {
-          MessageUtils msgUtils = new MessageUtils(WebServiceConsumptionPlugin.ID + ".plugin", this);
-          Status info = new SimpleStatus(WebServiceConsumptionPlugin.ID, msgUtils.getMessage("MSG_INFO_MONITORING_NOT_SUPPORTED",
-              new Object[] { server.getName()}), Status.INFO);
-          env.getStatusHandler().reportInfo(info);
-          return info;
-        }
-      }
-    }
-    return new SimpleStatus("");
-  }
-
-  private boolean hasContentWebServices(IMonitoredServerPort imsPort) {
-    String[] contents = imsPort.getContentTypes();
-    for (int i = 0; i < contents.length; i++)
-      if (WEB_SERVICES.equals(contents[i])) return true;
-    return false;
-  }
-
-  public void setServiceTypeRuntimeServer(TypeRuntimeServer typeRuntimeServer) {
-    this.serviceServerInstanceId = typeRuntimeServer.getServerInstanceId();
-  }
-
-  public void setServiceServerInstanceId(String serviceServerInstanceId) {
-    this.serviceServerInstanceId = serviceServerInstanceId;
-  }
-
-  public Integer getMonitoredPort() {
-    return monitoredPort;
-  }
-
-  public void setMonitorService(Boolean value) {
-    monitorService = value;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateServerCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateServerCommand.java
deleted file mode 100644
index 0533845..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateServerCommand.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.eclipse.jst.ws.internal.consumption.command.common;
-
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-
-public class CreateServerCommand extends SimpleCommand
-{
-	private String serverFactoryid;
-	private String serverInstanceId;
-	
-	public Status execute(Environment env)
-	{
-		return new SimpleStatus("");
-	}
-
-	public void setServerFactoryid(String serverFactoryid)
-	{
-		this.serverFactoryid = serverFactoryid;
-	}
-
-	public String getServerInstanceId()
-	{
-		return serverInstanceId;
-	}
-	
-	
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateServiceProjectCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateServiceProjectCommand.java
deleted file mode 100644
index 8ccf556..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateServiceProjectCommand.java
+++ /dev/null
@@ -1,252 +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.consumption.command.common;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.jst.ws.internal.common.EnvironmentUtils;
-import org.eclipse.jst.ws.internal.consumption.common.WebServiceStartServerRegistry;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.IServerWorkingCopy;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.server.core.model.IRunningActionServer;
-
-/**
- * 
- * 
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-public class CreateServiceProjectCommand extends SimpleCommand {
-
-  private boolean requiresEJB = false;  // future implementation perhaps
-  private boolean requiresWeb = false;
-  private String projectName;
-  private String earProjectName;
-  private String existingServerId;
-  private String serverFactoryId_;
-  private String j2eeVersion_;  
-  private boolean needEAR_;
-  private boolean isServiceProjectEJB_= false;
-  private boolean addedProjectToServer_ = false;
-
-  private IServer fExistingServer = null;
-  /**
-   * Default CTOR
-   */
-  public CreateServiceProjectCommand() {
-
-    super("org.eclipse.jst.ws.internal.consumption.command.common.CreateServiceProjectCommand",
-        "org.eclipse.jst.ws.internal.consumption.command.common.CreateServiceProjectCommand");
-  }
-  
-  public boolean isUndoable(){
-  	return true;
-  }
-
-  public Status undo(Environment env){
-  	Status stat = new SimpleStatus("");
-    try	{
-    	
-      // check existingServer
-      if (fExistingServer!=null) {
-
-        // get EAR project
-        IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-        IProject earProject = null;
-        if (earProjectName!=null && earProjectName.length()>0) {
-          earProject = root.getProject(earProjectName);
-    	}    
-        
-    	AbstractStartServer startServerCommand = null;
-    	WebServiceStartServerRegistry reg = WebServiceStartServerRegistry.getInstance();
-    	startServerCommand = (AbstractStartServer)reg.getServerStartByTypeId(fExistingServer.getServerType().getId());
-    	if (earProject!=null) {
-    		startServerCommand.runPostServerConfig(fExistingServer, earProject);
-    	}
-      }
-   	}
-    catch (CoreException ce ) {
-      IStatus embeddedStatus = ce.getStatus();
-      stat = EnvironmentUtils.convertIStatusToStatus(embeddedStatus);
-      env.getStatusHandler().reportError(stat);
-  		return stat;
-  	}  	
-  	
-  	return stat;
-  }  
-  
-  public Status execute(Environment env) {
-	
-    if (projectName == null) {
-      return new SimpleStatus("");
-    }
-    
-  	Status status = new SimpleStatus("");
-    IServer[] servers = ServerCore.getServers();
-    IServer existingServer = null;    
-    fExistingServer = null; 
-    for (int i=0; i<servers.length; i++)
-    {
-      IServer thisServer = (IServer)servers[i];
-      IServerWorkingCopy wc = null;
-      String thisServerId = null;
-      
-      if (thisServer!=null) {
-      	wc = thisServer.createWorkingCopy();
-      	thisServerId = (wc!=null ? wc.getId() : null);
-      }
-      if (thisServerId.equals(existingServerId)) {
-        existingServer = thisServer;
-      }
-    }
-    if (isServiceProjectEJB_)
-    {
-      CreateEJBProjectCommand c = new CreateEJBProjectCommand();
-      c.setEjbProjectName(projectName);
-      c.setEarProjectName(earProjectName);
-      c.setServiceExistingServer(existingServer);
-      c.setServerFactoryId(serverFactoryId_);
-      c.setJ2EEVersion(j2eeVersion_);
-      status = c.execute(env);
-    } 
-    else
-    {
-      CreateWebProjectCommand c = new CreateWebProjectCommand();
-      c.setProjectName(projectName);
-      c.setEarProjectName(earProjectName);
-      c.setExistingServer(existingServer);
-      c.setServerFactoryId(serverFactoryId_);
-      c.setJ2EEVersion(j2eeVersion_);
-      c.setNeedEAR(needEAR_);
-      c.setAddedProjectToServer(addedProjectToServer_);
-      status = c.execute(env);
-    }
-    
-    try	{
-        IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-        IProject earProject = null;
-        if (earProjectName!=null && earProjectName.length()>0)
-        {
-          earProject = root.getProject(earProjectName);
-        }    	
-    	
-   		AbstractStartServer startServerCommand = null;
-   		WebServiceStartServerRegistry reg = WebServiceStartServerRegistry.getInstance();
-     	startServerCommand = (AbstractStartServer)reg.getServerStartByTypeId(existingServer.getServerType().getId());
-    	startServerCommand.runPreServerConfig(existingServer, earProject);
-    	fExistingServer = existingServer;
-   	}
-    catch (CoreException ce ) {
-    	IStatus embeddedStatus = ce.getStatus();
-    	status = EnvironmentUtils.convertIStatusToStatus(embeddedStatus);
-    	env.getStatusHandler().reportError(status);
-  		return status;
-  	}
-    
-    // Start server if req'd
-    IServerWorkingCopy wc = fExistingServer.createWorkingCopy();     
-    if (wc!=null){
-      try {
-        Object x = fExistingServer.getAdapter(IRunningActionServer.class);
-        if (x!=null && x instanceof IRunningActionServer) {
-          int state = fExistingServer.getServerState();
-          if (state == IServer.STATE_STOPPED || state == IServer.STATE_UNKNOWN) {
-            String mode = ILaunchManager.RUN_MODE;
-            fExistingServer.synchronousStart(mode, EnvironmentUtils.getIProgressMonitor(env));
-          }
-        }
-      }
-      catch (CoreException cex) {
-    	IStatus embeddedStatus = cex.getStatus();
-    	status = EnvironmentUtils.convertIStatusToStatus(embeddedStatus);
-    	env.getStatusHandler().reportError(status);
-  		return status;         
-      }
-    }
-    
-   
-  	
-  	return status;    
-    
-  }
-
-  /**
-   * @param earProjectName The earProjectName to set.
-   * @todo Generated comment
-   */
-  public void setEarProjectName(String earProjectName) {
-
-    this.earProjectName = earProjectName;
-  }
-  
-  public void setExistingServerId(String existingServerId)
-  {
-    this.existingServerId = existingServerId;
-  }
-  /**
-   * @param projectName The projectName to set.
-   * @todo Generated comment
-   */
-  public void setProjectName(String projectName) {
-
-    this.projectName = projectName;
-  }
-  /**
-   * @param requiresEJB The requiresEJB to set.
-   * @todo Generated comment
-   */
-  public void setRequiresEJB(boolean requiresEJB) {
-
-    this.requiresEJB = requiresEJB;
-  }
-  /**
-   * @param requiresWeb The requiresWeb to set.
-   * @todo Generated comment
-   */
-  public void setRequiresWeb(boolean requiresWeb) {
-
-    this.requiresWeb = requiresWeb;
-  }
-  
-  public void setServerFactoryId(String serverFactoryId)
-  {
-  	serverFactoryId_ = serverFactoryId;
-  }
-  
-  public void setJ2EEVersion(String j2eeVersion)
-  {
-  	j2eeVersion_ = j2eeVersion;	
-  }
-  
-  public void setNeedEAR(boolean needEAR)
-  {
-    needEAR_ = needEAR;
-  }  
-  
-  public void setIsServiceProjectEJB(boolean isServiceProjectEJB)
-  {
-    this.isServiceProjectEJB_ = isServiceProjectEJB;
-  }
-  
-  
-  public void setAddedProjectToServer(boolean addedProjectToServer) 
-  {
-    addedProjectToServer_ = addedProjectToServer;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateWebProjectCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateWebProjectCommand.java
deleted file mode 100644
index 9a3e304..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateWebProjectCommand.java
+++ /dev/null
@@ -1,528 +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.consumption.command.common;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.earcreation.EARNatureRuntime;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.internal.servertarget.IServerTargetConstants;
-import org.eclipse.jst.j2ee.internal.web.archive.operations.WebComponentCreationDataModel;
-import org.eclipse.jst.j2ee.internal.web.archive.operations.WebComponentCreationOperation;
-import org.eclipse.jst.ws.internal.common.EnvironmentUtils;
-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.common.WebServiceStartServerRegistry;
-import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.Log;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerUtil;
-
-public class CreateWebProjectCommand extends SimpleCommand {
-
-  private final static String DESCRIPTION = "TASK_DESC_CREATE_WEB_PROJECT";
-  private final static String LABEL = "TASK_LABEL_CREATE_WEB_PROJECT";
-  private final String DEFAULT_EAR_NAME = "WebServiceEAR";
-  private String projectName_ = null;
-  private String earProjectName_ = null;
-  private boolean proxyCodegenEnabled = true;
-  private String serverFactoryId_;
-  private String j2eeVersion_;
-  private IServer existingServer_;
-  private boolean needEAR_;
-  private boolean weAddedProjectToServer_ = false;
-  private MessageUtils msgUtils_;
-
-  /**
-   * Default CTOR
-   */
-  public CreateWebProjectCommand() {
-
-    super(LABEL, DESCRIPTION);
-    String       pluginId = "org.eclipse.jst.ws.consumption";
-    msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
-    //setRunInWorkspaceModifyOperation(false);
-  }
-
-  /**
-   * Create service Web Project using the parameter Project name Note: to be
-   * deprecated
-   */
-  public CreateWebProjectCommand(String serviceProjectName) {
-
-    super(LABEL, DESCRIPTION);
-    projectName_ = serviceProjectName;
-    //setRunInWorkspaceModifyOperation(false);
-  }
-
-  public Status execute(Environment env) {
-
-    if (projectName_ == null || projectName_.length() == 0) {
-    	env.getLog().log(Log.ERROR, 5044, this, "execute", "Web project name not set");
-      Status status = new SimpleStatus(WebServiceConsumptionPlugin.ID, msgUtils_.getMessage("MSG_ERROR_WEB_PROJECT_CREATE"), Status.ERROR, null);
-      env.getStatusHandler().reportError(status);
-      return status; 
-    }
-
-    if (existingServer_ == null)
-    {
-      env.getLog().log(Log.ERROR, 5044, this, "execute", "Server is null");
-      Status status = new SimpleStatus(WebServiceConsumptionPlugin.ID, msgUtils_.getMessage("MSG_ERROR_WEB_PROJECT_CREATE"), Status.ERROR, null);
-      env.getStatusHandler().reportError(status);
-      return status;      
-    }
-    
-    IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-    IProject webProject = root.getProject(projectName_);
-    IProject earProject = null;
-    if (earProjectName_!=null && earProjectName_.length()>0)
-    {
-      earProject = root.getProject(earProjectName_);
-    }
-    
-    boolean projectExists = webProject != null && webProject.exists();
-    boolean addedToServer = false;
-    if (projectExists)
-    {
-      addedToServer = ServerUtil.containsModule(existingServer_,ResourceUtils.getModule(webProject), new NullProgressMonitor());
-    }
-    
-    boolean earExists = earProject!=null && earProject.exists();
-    boolean earAddedToServer = true;
-    if (earExists)
-    {
-      earAddedToServer = ServerUtil.containsModule(existingServer_,ResourceUtils.getModule(earProject), new NullProgressMonitor());
-    }
-    
-    boolean areAssociated = false;
-    if (projectExists && earExists)
-    {
-      areAssociated = J2EEUtils.isEARAssociated(webProject, earProject);
-    }
-    
-    boolean serverRequiresEARRemoval = true;
-    try
-    {
-      // check the Registry to see if the server requires EAR removal
-      if (serverFactoryId_!=null)
-      {
-        WebServiceStartServerRegistry wssReg = WebServiceStartServerRegistry.getInstance();
-        serverRequiresEARRemoval = wssReg.isRemoveEARRequired(serverFactoryId_);    		
-      }    
-    } catch (CoreException ce)
-    {
-      env.getLog().log(Log.ERROR, 5046, this, "execute", ce);
-      Status status = new SimpleStatus(WebServiceConsumptionPlugin.ID, msgUtils_.getMessage("MSG_ERROR_WEB_PROJECT_CREATE"), Status.ERROR, ce);
-      env.getStatusHandler().reportError(status);
-      return status;
-    }
-    
-    
-    if (!needEAR_ && projectExists && addedToServer && !weAddedProjectToServer_)
-    {
-      return new SimpleStatus("");
-    }
-    
-    // existing project, ear and server configuration
-    if (needEAR_ && projectExists && earExists && earAddedToServer && areAssociated && !weAddedProjectToServer_){
-    	return new SimpleStatus("");
-    }
-    
-    //Always stop the server
-    Status stoppingStatus = stopServer(env);
-    if(stoppingStatus.getSeverity() == Status.ERROR)
-        return stoppingStatus;
-    
-    if (!needEAR_ && projectExists && addedToServer)
-    {
-      return new SimpleStatus("");
-    }       
-    else if (!needEAR_ && projectExists && !addedToServer)
-    {
-      Status mmStatus = ServerUtils.getInstance().modifyModules(env, existingServer_, ResourceUtils.getModule(webProject) , true, new NullProgressMonitor());
-      if (mmStatus.getSeverity()==Status.ERROR)
-    	return mmStatus;      
-    }
-    else if (!needEAR_ && !projectExists)
-    {
-      Status status = createWebProject(env);
-      if(status.getSeverity() == Status.ERROR)
-        return status;
-      webProject = root.getProject(projectName_);
-      
-      Status mmStatus = ServerUtils.getInstance().modifyModules(env, existingServer_, ResourceUtils.getModule(webProject) , true, new NullProgressMonitor());
-      if (mmStatus.getSeverity()==Status.ERROR)
-    	return mmStatus;    
-    }
-    else if (projectExists && earExists && areAssociated && addedToServer)
-    {
-      return new SimpleStatus("");
-    }
-    else if (projectExists && earExists && areAssociated && !addedToServer)
-    {
-      Status mmStatus = ServerUtils.getInstance().modifyModules(env, existingServer_, ResourceUtils.getModule(webProject) , true, new NullProgressMonitor());
-      if (mmStatus.getSeverity()==Status.ERROR)
-    	return mmStatus;    
-    }
-    else if (projectExists && !earExists)
-    {
-      //Create the EAR project
-      Status status = createEARProject(env);
-      if (status.getSeverity() == Status.ERROR)
-        return status;
-      earProject = root.getProject(earProjectName_);
-      
-      //Associate the Web project and the EAR project
-      J2EEUtils.associateWebProject(webProject, earProject);
-      
-      //Add to server
-      Status mmStatus = ServerUtils.getInstance().modifyModules(env, existingServer_, ResourceUtils.getModule(webProject) , true, new NullProgressMonitor());
-      if (mmStatus.getSeverity()==Status.ERROR)
-    	return mmStatus;    
-    }
-    else if (!projectExists && !earExists)
-    {
-      //Create EAR
-      Status status = createEARProject(env);
-      if (status.getSeverity() == Status.ERROR)
-        return status;
-      earProject = root.getProject(earProjectName_);
-      
-      //Create project
-      status = createWebProject(env);
-      if(status.getSeverity() == Status.ERROR)
-        return status;
-      webProject = root.getProject(projectName_);
-      
-      //Add to server
-      Status mmStatus = ServerUtils.getInstance().modifyModules(env, existingServer_, ResourceUtils.getModule(webProject) , true, new NullProgressMonitor());
-      if (mmStatus.getSeverity()==Status.ERROR)
-    	return mmStatus;      
-    }
-    else if (!projectExists && earExists)
-    {
-      //Remove the ear from the server if necessary
-      if (earAddedToServer && serverRequiresEARRemoval)
-      {
-        // Stopping server and removing EAR from Server
-        if (existingServer_.getServerState() != IServer.STATE_STOPPED)
-        {
-          existingServer_.synchronousStop(false);
-        }        
-        Status mmStatus = ServerUtils.getInstance().modifyModules(env, existingServer_, ResourceUtils.getModule(earProject), false, new NullProgressMonitor());
-        if (mmStatus.getSeverity()==Status.ERROR)
-        	return mmStatus;      
-      }
-      
-      //Create the Web project
-      Status status = createWebProject(env);
-      if(status.getSeverity() == Status.ERROR)
-        return status;
-      webProject = root.getProject(projectName_);
-
-      boolean earAddedToServerFinal = ServerUtil.containsModule(existingServer_,ResourceUtils.getModule(earProject), new NullProgressMonitor());
-      if (!earAddedToServerFinal)
-      {
-      	Status mmStatus = ServerUtils.getInstance().modifyModules(env, existingServer_, ResourceUtils.getModule(webProject) , true, new NullProgressMonitor());  
-        if (mmStatus.getSeverity()==Status.ERROR)
-        	return mmStatus;      
-      }
-      
-    }
-    else if (projectExists && earExists && !areAssociated)
-    {
-      //Remove the ear from the server if necessary
-      if (earAddedToServer && serverRequiresEARRemoval)
-      {
-        // Stopping server and removing EAR from Server
-        if (existingServer_.getServerState() != IServer.STATE_STOPPED)
-        {
-          existingServer_.synchronousStop(false);
-        }        
-        Status mmStatus = ServerUtils.getInstance().modifyModules(env, existingServer_, ResourceUtils.getModule(earProject), false, new NullProgressMonitor());
-        if (mmStatus.getSeverity()==Status.ERROR)
-        	return mmStatus;      
-      }
-      
-      //Associate the Web project and the EAR project
-      J2EEUtils.associateWebProject(webProject, earProject);
-      
-      boolean earAddedToServerFinal = ServerUtil.containsModule(existingServer_,ResourceUtils.getModule(earProject), new NullProgressMonitor());      
-      if (!earAddedToServerFinal)
-      {
-      	Status mmStatus = ServerUtils.getInstance().modifyModules(env, existingServer_, ResourceUtils.getModule(webProject) , true, new NullProgressMonitor());  
-        if (mmStatus.getSeverity()==Status.ERROR)
-        	return mmStatus;      
-      }      
-      
-    }
-
-    return new SimpleStatus("");
-  }
-
-  private Status createWebProject(Environment env)
-  {
-    try
-    {
-    	
-    WebComponentCreationDataModel projectInfo = new WebComponentCreationDataModel();
-    projectInfo.setProperty(WebComponentCreationDataModel.PROJECT_NAME, projectName_);
-    String finalJ2EEVersion = null;
-    if (j2eeVersion_ != null && j2eeVersion_.length()>0)
-    {
-      projectInfo.setProperty(WebComponentCreationDataModel.J2EE_VERSION, new Integer(j2eeVersion_));
-      finalJ2EEVersion = j2eeVersion_;
-    }        
-    else        
-    {
-      if (earProjectName_ !=null && earProjectName_.length()>0)
-      {
-        IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-        IProject earProject = root.getProject(earProjectName_);
-        if (earProject != null && earProject.exists())
-        {
-          EARNatureRuntime ear = EARNatureRuntime.getRuntime(earProject);
-          int earVersion = ear.getJ2EEVersion();
-          projectInfo.setProperty(WebComponentCreationDataModel.J2EE_VERSION, new Integer(earVersion));
-          finalJ2EEVersion = String.valueOf(earVersion);
-        }
-        else
-        {          
-          projectInfo.setProperty(WebComponentCreationDataModel.J2EE_VERSION, new Integer(J2EEVersionConstants.J2EE_1_3_ID));
-          finalJ2EEVersion = String.valueOf(J2EEVersionConstants.J2EE_1_3_ID);
-        }
-      }
-      else
-      {
-        projectInfo.setProperty(WebComponentCreationDataModel.J2EE_VERSION, new Integer(J2EEVersionConstants.J2EE_1_3_ID));
-        finalJ2EEVersion = String.valueOf(J2EEVersionConstants.J2EE_1_3_ID);        
-      }
-      
-    }    
-    String runtimeTargetId = null;
-    if (serverFactoryId_!=null && serverFactoryId_.length()>0)
-    {
-//		TODO - Add this logic to FlexibleProjectCreationDataModel, and op....
-//      runtimeTargetId = ServerUtils.getServerTargetIdFromFactoryId(serverFactoryId_,IServerTargetConstants.WEB_TYPE, finalJ2EEVersion); 
-//      projectInfo.setProperty(WebComponentCreationDataModel.SERVER_TARGET_ID, runtimeTargetId );
-//      projectInfo.setProperty(WebComponentCreationDataModel.ADD_SERVER_TARGET, Boolean.TRUE);      
-    } 
-    
-    if (earProjectName_ !=null && earProjectName_.length()>0)
-    {
-      projectInfo.setProperty(WebComponentCreationDataModel.EAR_MODULE_NAME, earProjectName_);
-      projectInfo.setProperty(WebComponentCreationDataModel.ADD_TO_EAR, Boolean.TRUE);
-    }
-    else
-    {
-      projectInfo.setProperty(WebComponentCreationDataModel.ADD_TO_EAR, Boolean.FALSE);
-    }
-    	
-    
-
-    //Create and run the operation
-    WebComponentCreationOperation op = new WebComponentCreationOperation(projectInfo);
-      op.run(new NullProgressMonitor());    
-    return new SimpleStatus("");
-    } catch (Exception e)
-    {
-      env.getLog().log(Log.ERROR, 5046, this, "createWebProject", e);
-      Status status = new SimpleStatus(WebServiceConsumptionPlugin.ID, msgUtils_.getMessage("MSG_ERROR_WEB_PROJECT_CREATE"), Status.ERROR, e);
-      env.getStatusHandler().reportError(status);
-      return status;      
-    }
-  }
-  
-  private Status createEARProject(Environment env)
-  {
-    CreateEARProjectCommand t = new CreateEARProjectCommand();
-    t.setEarProjectName(earProjectName_);
-    t.setServerFactoryId(serverFactoryId_);
-    t.setJ2EEVersion(j2eeVersion_);
-    Status status = t.execute(env);
-    return status;
-  }             
-  
-  private Status stopServer(Environment env)
-  {
- 	
-    try
-   	{
-   		WebServiceStartServerRegistry reg = WebServiceStartServerRegistry.getInstance();
-   		AbstractStartServer startServerCommand = (AbstractStartServer)reg.getServerStartByTypeId(existingServer_.getServerType().getId());
-    	startServerCommand.stopServer(existingServer_);
-    	return new SimpleStatus("");
-   	}
-  catch (CoreException ce )
-  	{
-    	IStatus embeddedStatus = ce.getStatus();
-    	Status status = EnvironmentUtils.convertIStatusToStatus(embeddedStatus);
-    	env.getStatusHandler().reportError(status);
-  		return status;
-  	}  	
-  	
-
-  }
-  
-  // To be deprecated
-  /*
-  private Status createWebProject(String webProjectName, String earProjectName, Environment env) {
-
-    try {
-      IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-      IProject earProject = root.getProject(earProjectName);
-      if (earProject != null && !earProject.exists()) {
-        CreateEARProjectCommand c = new CreateEARProjectCommand();
-        c.setEarProjectName(earProjectName);
-        c.setServerFactoryId(serverFactoryId_);
-        c.setJ2EEVersion(j2eeVersion_);
-        c.execute(env);
-        earProject = root.getProject(earProjectName);
-      }
-      IProject webProject = root.getProject(webProjectName);
-      if (webProject != null && !webProject.exists()) {
-        WebComponentCreationDataModel info = new WebComponentCreationDataModel();
-        info.setProperty(WebComponentCreationDataModel.PROJECT_NAME, webProjectName);
-        info.setProperty(WebComponentCreationDataModel.EAR_PROJECT_NAME, earProjectName);
-        //info.setProperty(WebComponentCreationDataModel.ADD_TO_EAR, Boolean.TRUE);
-        info.setProperty(WebComponentCreationDataModel.ADD_TO_EAR, Boolean.FALSE);
-        if (serverFactoryId_!=null && serverFactoryId_.length()>0)
-        {
-          String runtimeTargetId = ServerUtils.getRuntimeTargetIdFromFactoryId(serverFactoryId_); 
-          info.setProperty(WebComponentCreationDataModel.SERVER_TARGET_ID, runtimeTargetId );
-          info.setProperty(WebComponentCreationDataModel.ADD_SERVER_TARGET, Boolean.TRUE);
-        }
-        if (j2eeVersion_ != null && j2eeVersion_.length()>0)
-        {
-          info.setProperty(WebComponentCreationDataModel.J2EE_VERSION, new Integer(j2eeVersion_));
-        }                
-
-        WebProjectCreationOperation operation = new WebProjectCreationOperation(info);
-        operation.run(new NullProgressMonitor());
-      }
-    }
-    catch (java.lang.reflect.InvocationTargetException ite) {
-      return new SimpleStatus(WebServiceConsumptionPlugin.ID, msgUtils_.getMessage("MSG_ERROR_WEB_PROJECT_CREATE"), Status.ERROR,
-          ite);
-    }
-    catch (InterruptedException ie) {
-      return new SimpleStatus(WebServiceConsumptionPlugin.ID, msgUtils_.getMessage("MSG_ERROR_WEB_PROJECT_CREATE"), Status.ERROR,
-          ie);
-    }
-    return new SimpleStatus("");
-  }
-  */
-  
-  private String getNewEARName() {
-
-    String newEARName = DEFAULT_EAR_NAME;
-    //Check to see if it exists
-    IProject project = ResourceUtils.getWorkspace().getRoot().getProject(newEARName);
-    return newEARName;
-  }
-
-  
-  private IProject getDefaultEARProject(IProject project) {
-
-    try {
-      EARNatureRuntime[] ears = null;
-      EARNatureRuntime ear = null;
-      ears = J2EEProjectUtilities.getReferencingEARProjects(project);
-      if (ears[0] != null && ears.length >= 1) {
-        // found an EAR containing the web project
-        return ears[0].getProject();
-      }
-
-      if (j2eeVersion_!=null && j2eeVersion_.length()>0)
-      {
-      	ear = J2EEUtils.getEAR(Integer.parseInt(j2eeVersion_));
-      }
-      else
-      {
-        ear = J2EEUtils.get12EAR();
-        if (ear == null)
-          ear = J2EEUtils.get13EAR();
-        if (ear == null)
-          ear = J2EEUtils.getEAR(J2EEVersionConstants.J2EE_1_4_ID);
-      }
-      
-      if (ear != null)
-        return ear.getProject();
-      else {
-        String earName = getNewEARName();
-        IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-        return root.getProject(earName);
-      }
-    }
-    catch (Exception e) {
-      return null;
-    }
-
-  }
-
-  /**
-   * @param earProjectName
-   *          The earProjectName to set.
-   */
-  public void setEarProjectName(String earProjectName) {
-
-    this.earProjectName_ = earProjectName;
-  }
-
-  /**
-   * @param projectName
-   *          The projectName to set.
-   */
-  public void setProjectName(String projectName) {
-
-    this.projectName_ = projectName;
-  }
-
-  /**
-   * @param existingServer
-   *          The existingServer to set.
-   */
-  public void setExistingServer(IServer existingServer) {
-
-    this.existingServer_ = existingServer;
-  }
-  
-  public void setServerFactoryId(String serverFactoryId)
-  {
-  	serverFactoryId_ = serverFactoryId;
-  }
-  
-  public void setJ2EEVersion(String j2eeVersion)
-  {
-  	j2eeVersion_ = j2eeVersion;	
-  }
-  
-  public void setNeedEAR(boolean needEAR)
-  {
-    needEAR_ = needEAR;
-  }
-  
-  public void setAddedProjectToServer(boolean addedProjectToServer) 
-  {
-    weAddedProjectToServer_ = addedProjectToServer;
-  }  
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/DisableBuildCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/DisableBuildCommand.java
deleted file mode 100644
index 8670ebe..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/DisableBuildCommand.java
+++ /dev/null
@@ -1,73 +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.consumption.command.common;
-
-import org.eclipse.jst.ws.internal.consumption.datamodel.validate.ValidationManager;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-
-
-public class DisableBuildCommand extends SimpleCommand 
-{
-  private MessageUtils msgUtils_;
-  private Model model_;
-  private ValidationManager manager_;
-  private String LABEL = "TASK_LABEL_WEBSERVICE_DISABLE_BUILD";
-  private String DESCRIPTION = "TASK_DESC_WEBSERVICE_DISABLE_BUILD";
-  /**
-   * CTOR;
-   */
-  public DisableBuildCommand()
-  {
-    String pluginId = "org.eclipse.jst.ws.consumption";
-    msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-
-    setName(msgUtils_.getMessage(LABEL));
-    setDescription(msgUtils_.getMessage(DESCRIPTION));
-  }
-
-  /**
-   * Execute the command
-   */
-  public Status execute(Environment env)  {
-    Status status = new SimpleStatus("");
-
-    env.getProgressMonitor().report(msgUtils_.getMessage("TASK_DESC_WEBSERVICE_DISABLE_BUILD"));
-
-    if (manager_!=null) {
-      manager_.disableAutoBuild();
-    }
-    return status;
-  }
-
-  /**
-   * Set the model
-   * 
-   * @param model
-   */
-  public void setModel(Model model) {
-    this.model_ = model;
-  }  
-  
-  
-  /**
-   * @param manager_ The manager_ to set.
-   */
-  public void setValidationManager(ValidationManager manager) {
-    this.manager_ = manager;
-  }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/DisableValidationCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/DisableValidationCommand.java
deleted file mode 100644
index be03646..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/DisableValidationCommand.java
+++ /dev/null
@@ -1,67 +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.consumption.command.common;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.ws.internal.consumption.datamodel.validate.ValidationManager;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-
-
-public class DisableValidationCommand extends SimpleCommand {
-
-  private MessageUtils msgUtils_;
-  private ValidationManager manager_;
-  private IProject serviceProject_;
-  private String LABEL = "TASK_LABEL_WEBSERVICE_DISABLE_VALIDATION";
-  private String DESCRIPTION = "TASK_DESC_WEBSERVICE_DISABLE_VALIDATION";
-
-  /**
-   * CTOR;
-   */
-  public DisableValidationCommand() {
-    String pluginId = "org.eclipse.jst.ws.consumption";
-    msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-
-    setName(msgUtils_.getMessage(LABEL));
-    setDescription(msgUtils_.getMessage(DESCRIPTION));
-  }
-
-  /**
-   * Execute the command
-   */
-  public Status execute(Environment env) {
-    Status status = new SimpleStatus("");
-
-    env.getProgressMonitor().report(msgUtils_.getMessage("TASK_DESC_WEBSERVICE_DISABLE_VALIDATION"));
-
-    IProject project = serviceProject_;
-    if (project != null) manager_.disableValidationForProject(project);
-
-    return status;
-  }
-
-  /**
-   * @param manager_
-   *            The manager_ to set.
-   */
-  public void setValidationManager(ValidationManager manager) {
-    this.manager_ = manager;
-  }
-  
-  public void setServiceProject(IProject serviceProject){
-    this.serviceProject_ = serviceProject;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/GetMonitorCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/GetMonitorCommand.java
deleted file mode 100644
index 0e134a6..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/GetMonitorCommand.java
+++ /dev/null
@@ -1,204 +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.consumption.command.common;
-
-// TODO: Get rid of this. A replacement is in org.eclipse.wst.ws.
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Port;
-import javax.wsdl.Service;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.http.HTTPAddress;
-import javax.wsdl.extensions.soap.SOAPAddress;
-
-import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.command.env.core.common.StatusException;
-import org.eclipse.wst.internet.monitor.core.IMonitor;
-import org.eclipse.wst.internet.monitor.core.IMonitorWorkingCopy;
-import org.eclipse.wst.internet.monitor.core.MonitorCore;
-import org.eclipse.wst.server.core.util.SocketUtil;
-import org.eclipse.wst.ws.parser.wsil.WebServicesParser;
-
-public class GetMonitorCommand extends SimpleCommand
-{
-  private boolean monitorService;
-  private boolean create;
-  private WebServicesParser webServicesParser;
-  private String wsdlURI;
-  private List endpoints;
-
-  public GetMonitorCommand()
-  {
-    super("org.eclipse.jst.ws.internal.consumption.command.common.GetMonitorCommand", "org.eclipse.jst.ws.internal.consumption.command.common.GetMonitorCommand");
-    monitorService = true;
-    create = true;
-  }
-
-  public Status execute(Environment env)
-  {
-    endpoints = new Vector();
-    if (monitorService && webServicesParser != null && wsdlURI != null && wsdlURI.length() > 0)
-    {
-      Definition definition = webServicesParser.getWSDLDefinition(wsdlURI);
-      if (definition != null)
-      {
-        Map services = definition.getServices();
-        for (Iterator servicesIt = services.values().iterator(); servicesIt.hasNext();)
-        {
-          Service service = (Service)servicesIt.next();
-          Map ports = service.getPorts();
-          for (Iterator portsIt = ports.values().iterator(); portsIt.hasNext();)
-          {
-            Port wsdlPort = (Port)portsIt.next();
-            List extElements = wsdlPort.getExtensibilityElements();
-            for (Iterator extElementsIt = extElements.iterator(); extElementsIt.hasNext();)
-            {
-              ExtensibilityElement extElement = (ExtensibilityElement)extElementsIt.next();
-              String endpoint = null;
-              URL endpointURL = null;
-              if (extElement instanceof SOAPAddress)
-                endpoint = ((SOAPAddress)extElement).getLocationURI();
-              else if (extElement instanceof HTTPAddress)
-                endpoint = ((HTTPAddress)extElement).getLocationURI();
-              if (endpoint != null)
-              {
-                try
-                {
-                  endpointURL = new URL(endpoint);
-                }
-                catch (MalformedURLException murle)
-                {
-                }
-              }
-              if (endpointURL != null)
-              {
-                String protocol = endpointURL.getProtocol();
-                String host = endpointURL.getHost();
-                int port = endpointURL.getPort();
-                if (port == -1)
-                {
-                  if ("http".equalsIgnoreCase(protocol))
-                    port = 80;
-                  else if ("https".equalsIgnoreCase(protocol))
-                    port = 443;
-                }
-                if (protocol != null && protocol.startsWith("http") && host != null && host.length() > 0 && port != -1)
-                {
-                  IMonitor m = null;
-                  IMonitor[] monitors = MonitorCore.getMonitors();
-                  for (int i=0; i<monitors.length; i++)
-                  {
-                    if (host.equalsIgnoreCase(monitors[i].getRemoteHost()) && port == monitors[i].getRemotePort())
-                    {
-                      m = monitors[i];
-                      break;
-                    }
-                  }
-                  if (m == null && create)
-                  {
-                    int monitoredPort = SocketUtil.findUnusedPort(5000, 15000);
-                    IMonitorWorkingCopy monitorWorkingCopy = MonitorCore.createMonitor();
-                    monitorWorkingCopy.setLocalPort(monitoredPort);
-                    monitorWorkingCopy.setRemoteHost(host);
-                    monitorWorkingCopy.setRemotePort(port);
-                    monitorWorkingCopy.setProtocol("HTTP");
-                    try
-                    {
-                      m = monitorWorkingCopy.save();
-                    }
-                    catch (Throwable t)
-                    {
-                      Status warning = new SimpleStatus(WebServiceConsumptionPlugin.ID, WebServiceConsumptionPlugin.getMessage("MSG_ERROR_UNABLE_TO_START_MONITOR", new Object[]{String.valueOf(port), endpoint}), Status.WARNING, t);
-                      try
-                      {
-                        if (env != null)
-                          env.getStatusHandler().report(warning);
-                      }
-                      catch (StatusException se)
-                      {
-                      }
-                    }
-                  }
-                  if (m != null)
-                  {
-                    try
-                    {
-                      if (!m.isRunning())
-                        m.start();
-                      StringBuffer sb = new StringBuffer(endpointURL.getProtocol());
-                      sb.append("://localhost:");
-                      sb.append(String.valueOf(m.getLocalPort()));
-                      sb.append(endpointURL.getFile());
-                      endpoints.add(sb.toString());
-                    }
-                    catch (Throwable t)
-                    {
-                      Status warning = new SimpleStatus(WebServiceConsumptionPlugin.ID, WebServiceConsumptionPlugin.getMessage("MSG_ERROR_UNABLE_TO_START_MONITOR", new Object[]{String.valueOf(port), endpoint}), Status.WARNING, t);
-                      try
-                      {
-                        if (env != null)
-                          env.getStatusHandler().report(warning);
-                      }
-                      catch (StatusException se)
-                      {
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-    return new SimpleStatus("");
-  }
-
-  public void setMonitorService(boolean monitorService)
-  {
-    this.monitorService = monitorService;
-  }
-
-  public void setDefinition(Definition definition)
-  {
-  }
-
-  public void setWebServicesParser(WebServicesParser webServicesParser)
-  {
-    this.webServicesParser = webServicesParser;
-  }
-  
-  public void setWsdlURI(String wsdlURI)
-  {
-    this.wsdlURI = wsdlURI;
-  }
-
-  public void setCreate(boolean create)
-  {
-    this.create = create;
-  }
-
-  public List getEndpoints()
-  {
-    return endpoints;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/JavaMofReflectionCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/JavaMofReflectionCommand.java
deleted file mode 100644
index e8b4634..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/JavaMofReflectionCommand.java
+++ /dev/null
@@ -1,124 +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.consumption.command.common;
-
-
-//core stuff
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.jem.internal.plugin.JavaEMFNature;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.impl.JavaClassImpl;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-
-
-/**
-* This class is to be used to Build the data model
-* first we get the java class and then build the model
-*/
-public class JavaMofReflectionCommand extends SimpleCommand
-{
-
-  public static String LABEL = "JavaMofReflectionCommand"; 
-  public static String DESCRIPTION = "reflection for a given class"; 
-  public static String OK_MESSAGE =  "The model has been built "; 
-  private static String JAVA_EXTENSION = ".java";
-  private static String CLASS_EXTENSION = ".class";
-  private MessageUtils msgUtils_;
-  
-  private String clientProject;
-  private ResourceSet resourceSet;
-  private JavaHelpers javaClass;
-  private String qname;
-  private String proxyBean;
-  private IProject clientIProject;
- 
-  /**
-  * Constructs a new JavaMofReflectionCommand with the given label and description
-  * 
-  */
-  public JavaMofReflectionCommand()
-  {
-	String pluginId = "org.eclipse.jst.ws.consumption";
-	msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-
-    setDescription(DESCRIPTION);
-    setName(LABEL);
-  }
-  
-  // setters for this command
-  
-    
-  /**
-  * The end result of this whole process is to get the Java Class
-  */
-  public JavaHelpers getJavaClass()
-  {
-    return javaClass;
-  }
-
-  
-  private void processQName()
-  {
-      qname = proxyBean;
-	  if (qname.toLowerCase().endsWith(JAVA_EXTENSION)) {
-		  qname = qname.substring(0,(qname.length() -5));
-	  }
-	  if (qname.toLowerCase().endsWith(CLASS_EXTENSION)) {
-		  qname = qname.substring(0,(qname.length() -6));
-	  }
-   }
-      
-  /**
-  * Get the java model from the resource then 
-  * build the model from the mof
-  */
-  public Status execute(Environment env)
-  {
- 	//just make sure the project and qname are there
-  	//they are essential for this operation
-  	Status status = new SimpleStatus("");
-  	IProject clientIProject = (IProject)ResourceUtils.findResource(clientProject);
-  	processQName();
-  	if(clientProject == null || qname == null)
-  	  return new SimpleStatus(WebServiceConsumptionPlugin.ID,WebServiceConsumptionPlugin.getMessage("%MSG_WARN_UNABLE_TO_FIND_PROXY"),Status.WARNING);
-  	
-    JavaEMFNature nature = (JavaEMFNature)JavaEMFNature.getRuntime(clientIProject);
-    if(nature == null){
-      try{
-        nature = (JavaEMFNature)JavaEMFNature.createRuntime(clientIProject);  	
-      }catch(CoreException exc){}
-    }
-    resourceSet = nature.getResourceSet();
-    javaClass = (JavaHelpers)JavaClassImpl.reflect(qname, resourceSet); 
-    
-    return status;
-  }
-  
-  public void setProxyBean(String proxyBean)
-  {
-  	this.proxyBean = proxyBean;
-  }
-
-  public void setClientProject(String clientProject)
-  {
-  	this.clientProject = clientProject;
-  }
-  
- }
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ManageServerStartUpCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ManageServerStartUpCommand.java
deleted file mode 100644
index fcc7dae..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ManageServerStartUpCommand.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.jst.ws.internal.consumption.command.common;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.server.core.IServer;
-
-/**
- * @author sengpl
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class ManageServerStartUpCommand extends SimpleCommand {
-
-	private java.lang.String DESCRIPTION = "Start Web Project";
-	private java.lang.String LABEL = "ServerStartUpManager";
-	private MessageUtils msgUtils_;
-	
-	private Boolean isStartServiceEnabled_;
-	private Boolean isTestServiceEnabled_;
-	
-	private IProject serviceProject_;
-	private String serviceServerTypeId_;
-	private IServer serviceExistingServer_;
-	
-	private IProject sampleProject_;
-	private String sampleServerTypeId_;
-	private IServer sampleExistingServer_;
-	
-	private boolean isWebProjectStartupRequested_;
-
-	/**
-	 * Default CTOR;
-	 */
-	public ManageServerStartUpCommand() {
-		String pluginId = "org.eclipse.jst.ws.consumption";
-		msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-	}
-	
-	/**
-	 * Execute the command
-	 */
-	public Status execute(Environment env)
-	{
-	    Status status = new SimpleStatus( "" );
-	    env.getProgressMonitor().report(msgUtils_.getMessage("PROGRESS_INFO_START_WEB_PROJECT"));
-	 
-	    if (isStartServiceEnabled_.booleanValue() && serviceExistingServer_!=null){
-	    	//System.out.println("Calling service server start: "+serviceProject_+"  "+serviceServerTypeId_);
-	    	StartProjectCommand spc = new StartProjectCommand();
-	    	spc.setServiceProject(serviceProject_);
-	    	spc.setServiceServerTypeID(serviceServerTypeId_);
-	    	spc.setServiceExistingServer(serviceExistingServer_);
-	    	spc.setIsWebProjectStartupRequested(isWebProjectStartupRequested_);
-	    	spc.execute(env);
-	    }
-	    
-	    if(isTestServiceEnabled_.booleanValue()&& sampleExistingServer_!=null && serviceExistingServer_!=null && !sampleExistingServer_.equals(serviceExistingServer_)){
-	    	//System.out.println("Calling client server start: "+sampleProject_+"  "+sampleExistingServer__);
-	    	StartProjectCommand spc = new StartProjectCommand();
-	    	spc.setSampleProject(sampleProject_);
-	    	spc.setSampleServerTypeID(sampleServerTypeId_);
-	    	spc.setSampleExistingServer(sampleExistingServer_);
-	    	spc.setCreationScenario(new Boolean("false"));
-	    	spc.execute(env);	    	
-	    }
-	    
-	    return status;
-	}
-	
-	/**
-	 * @param isStartServiceEnabled The isStartServiceEnabled to set.
-	 */
-	public void setStartService(Boolean isStartServiceEnabled) {
-		this.isStartServiceEnabled_ = isStartServiceEnabled;
-	}
-	/**
-	 * @param isTestServiceEnabled The isTestServiceEnabled to set.
-	 */
-	public void setTestService(Boolean isTestServiceEnabled) {
-		this.isTestServiceEnabled_ = isTestServiceEnabled;
-	}
-	/**
-	 * @param serviceExistingServer The serviceExistingServer to set.
-	 */
-	public void setServiceExistingServer(IServer serviceExistingServer) {
-		this.serviceExistingServer_ = serviceExistingServer;
-	}
-
-	/**
-	 * @param serviceServerTypeId The serviceServerTypeId to set.
-	 */
-	public void setServiceServerTypeId(String serviceServerTypeId) {
-		this.serviceServerTypeId_ = serviceServerTypeId;
-	}
-	/**
-	 * @param serviceProject The serviceProject to set.
-	 */
-	public void setServiceProject(IProject serviceProject) {
-		this.serviceProject_ = serviceProject;
-	}
-	
-	/**
-	 * @param sampleExistingServer The sampleExistingServer to set.
-	 */
-	public void setSampleExistingServer(IServer sampleExistingServer) {
-		this.sampleExistingServer_ = sampleExistingServer;
-	}
-	/**
-	 * @param sampleProject The sampleProject to set.
-	 */
-	public void setSampleProject(IProject sampleProject) {
-		this.sampleProject_ = sampleProject;
-	}
-	/**
-	 * @param sampleServerTypeId The sampleServerTypeId to set.
-	 */
-	public void setSampleServerTypeId(String sampleServerTypeId) {
-		this.sampleServerTypeId_ = sampleServerTypeId;
-	}	
-	
-	/**
-	 * @param isRestartProjectNeeded The isRestartProjectNeeded to set.
-	 */
-	public void setIsWebProjectStartupRequested(boolean isRestartProjectNeeded) {
-		this.isWebProjectStartupRequested_ = isRestartProjectNeeded;
-	}	
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/PublishProjectCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/PublishProjectCommand.java
deleted file mode 100644
index f7d6520..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/PublishProjectCommand.java
+++ /dev/null
@@ -1,109 +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.consumption.command.common;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.ws.internal.common.EnvironmentUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.Log;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.server.core.IServer;
-
-public class PublishProjectCommand extends SimpleCommand {
-
-private java.lang.String DESCRIPTION = "Publish Web Project";
-private java.lang.String LABEL       = "PublishProjectCommand";
-private MessageUtils msgUtils_;
-
-private String project;
-private String serverTypeID;
-private IServer existingServer;
-
-
-/**
- * Default CTOR;
- */
-public PublishProjectCommand() {
-  String pluginId = "org.eclipse.jst.ws.consumption";
-  msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-  setDescription(DESCRIPTION);
-  setName(LABEL);  
-  //TODO setRunInWorkspaceModifyOperation(false);
-}
-
-/**
- * Execute the command
- */
-public Status execute(Environment env)
-{
-  
-  Status status = new SimpleStatus("");
-  try
-  {
-    env.getProgressMonitor().report( msgUtils_.getMessage( "PROGRESS_INFO_PUBLISH_WEB_PROJECT" ) );
-    
-    if (project == null){
-      status = new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_PROJECT_NOT_FOUND"), Status.ERROR); 
-      env.getStatusHandler().reportError(status);
-      return status;
-    }
-	
-    IProject iProject = (IProject)ResourceUtils.findResource(project);
-    IServer instance = ServerUtils.getServerForModule(ResourceUtils.getModule(iProject), serverTypeID, existingServer, true, EnvironmentUtils.getIProgressMonitor(env));
-    if (instance == null)
-    {
-      status = new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_INSTANCE_NOT_FOUND"), Status.ERROR);
-      env.getStatusHandler().reportError(status);
-      return status;
-    }
-
-      IStatus returnedStatus = instance.publish(IServer.PUBLISH_INCREMENTAL, EnvironmentUtils.getIProgressMonitor(env));
-      status = EnvironmentUtils.convertIStatusToStatus(returnedStatus);
-      
-      //getStatusMonitor().reportStatus (instance.publish(getProgressMonitor()));
-      env.getLog().log(Log.OK, 5026, this, "execute", new String("project="+project+" successfully published"));
-      //Log.write(PublishProjectCommand.class,"execute",Log.OK,"project="+project+" successfully published");
-      return status;
-  }
-  catch (Exception e) {
-    status = new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_PUBLISH"), Status.ERROR, e);
-    env.getStatusHandler().reportError(status);
-    return status;
-
-  }
-}
-
-
-public void setProject(String project)
-{
-  this.project = project;
-}
-
-public void setServerTypeID(String serverTypeID)
-{
-  this.serverTypeID = serverTypeID;
-}
-
-public void setExistingServer(IServer existingServer)
-{
-  this.existingServer = existingServer;
-}
-
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/RestoreBuildStateCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/RestoreBuildStateCommand.java
deleted file mode 100644
index db0f563..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/RestoreBuildStateCommand.java
+++ /dev/null
@@ -1,63 +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.consumption.command.common;
-
-
-import org.eclipse.jst.ws.internal.consumption.datamodel.validate.ValidationManager;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-
-
-public class RestoreBuildStateCommand extends SimpleCommand
-{
-
-  private MessageUtils msgUtils_;
-  private ValidationManager manager_;
-  
-  private String LABEL = "TASK_LABEL_WEBSERVICE_RESTORE_BUILD";
-  private String DESCRIPTION = "TASK_DESC_WEBSERVICE_RESTORE_BUILD";
-  /**
-   * Default CTOR;
-   */
-  public RestoreBuildStateCommand()
-  {
-    String pluginId = "org.eclipse.jst.ws.consumption";
-    msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-
-    setName(msgUtils_.getMessage(LABEL));
-    setDescription(msgUtils_.getMessage(DESCRIPTION));    
-
-  }
-
-  /**
-   * Execute the command
-   */
-  public Status execute(Environment env)
-  {
-    env.getProgressMonitor().report(msgUtils_.getMessage("TASK_DESC_WEBSERVICE_RESTORE_BUILD"));
-
-    manager_.restoreAutoBuild();
-
-    return new SimpleStatus("");
-  }
-    
-  /**
-   * @param manager_ The manager_ to set.
-   */
-  public void setValidationManager(ValidationManager manager) {
-    this.manager_ = manager;
-  }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/RestoreValidationStateCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/RestoreValidationStateCommand.java
deleted file mode 100644
index e67de11..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/RestoreValidationStateCommand.java
+++ /dev/null
@@ -1,65 +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.consumption.command.common;
-
-
-import org.eclipse.jst.ws.internal.consumption.datamodel.validate.ValidationManager;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-
-
-public class RestoreValidationStateCommand extends SimpleCommand 
-{
-  private MessageUtils msgUtils_;
-  private ValidationManager manager_;
-  
-  private String LABEL = "TASK_LABEL_WEBSERVICE_RESTORE_VALIDATION";
-  private String DESCRIPTION = "TASK_DESC_WEBSERVICE_RESTORE_VALIDATION";  
-
-  private boolean runValidation_;
-
-  /**
-   * Default CTOR;
-   */
-  public RestoreValidationStateCommand( boolean runValidation )
-  {
-    String pluginId = "org.eclipse.jst.ws.consumption";
-    msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-
-    setName(msgUtils_.getMessage(LABEL));
-    setDescription(msgUtils_.getMessage(DESCRIPTION)); 
-    runValidation_ = runValidation;
-  }
-
-  /**
-   * Execute the command
-   */
-  public Status execute(Environment env)
-  {
-    env.getProgressMonitor().report(msgUtils_.getMessage("TASK_DESC_WEBSERVICE_RESTORE_VALIDATION"));
-
-    manager_.restoreValidationForProjects( runValidation_ );    
-
-    return new SimpleStatus("");
-  }
-    
-  /**
-   * @param manager The validation manager to set.
-   */
-  public void setValidationManager(ValidationManager manager) {
-    this.manager_ = manager;
-  }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ServerDeployableConfigurationCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ServerDeployableConfigurationCommand.java
deleted file mode 100644
index 0268083..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ServerDeployableConfigurationCommand.java
+++ /dev/null
@@ -1,233 +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.consumption.command.common;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.ws.internal.common.EnvironmentUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.IServerWorkingCopy;
-import org.eclipse.wst.server.core.ServerUtil;
-
-public class ServerDeployableConfigurationCommand extends SimpleCommand {
-
-  private String LABEL = "ServerDeployableConfigurationCommand";
-  private String DESCRIPTION = "Ensure Deployable is added to Server Configuration";
-  private MessageUtils msgUtils_;
-  private Boolean creationScenario_ = Boolean.TRUE;
-  private TypeRuntimeServer clientIds_;
-  private IProject serviceProject_;
-  private IProject sampleProject_;
-  private String serviceServerTypeID_;
-  private String sampleServerTypeID_;
-  private IServer serviceExistingServer_;
-  private IServer sampleExistingServer_;
-  private String serviceProjectURL_;
-  private String sampleProjectURL_;
-  
-  //addedProjectToServer_ is set to true if
-  //- the project exists AND
-  //- the server exists (i.e. this command did not create it) AND
-  //- this command added the project to the server
-  private boolean addedProjectToServer_ = false;
-
-  /**
-   * Default CTOR
-   */
-  public ServerDeployableConfigurationCommand() {
-    String pluginId = "org.eclipse.jst.ws.consumption";
-    msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-    setDescription(DESCRIPTION);
-    setName(LABEL);
-  }
-
-  /**
-   * Default CTOR
-   */
-  public ServerDeployableConfigurationCommand(boolean creationScenario) {
-    String pluginId = "org.eclipse.jst.ws.consumption";
-    msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-    setDescription(DESCRIPTION);
-    setName(LABEL);
-    creationScenario_ = new Boolean(creationScenario);
-  }
-
-  /**
-   * execute
-   */
-  public Status execute(Environment env) {
-
-	  System.out.println("ServerDeployableConfigurationCommand");
-    Status status = new SimpleStatus("");
-    try {
-
-      if (!(creationScenario_.booleanValue()) )
-        return status;
-
-      // determine client or service project
-      IProject project = ((creationScenario_.booleanValue()) ? serviceProject_ : sampleProject_);
-      if (project == null)
-        return status;
-
-      sampleServerTypeID_ = clientIds_.getServerId();
-      
-      // determine service or sample server factory Id
-      String serverFactoryId = ((creationScenario_.booleanValue()) ? serviceServerTypeID_ : sampleServerTypeID_);
-
-      // get an IServer object; either existing or create one
-      IServer server = ((creationScenario_.booleanValue()) ? serviceExistingServer_ : sampleExistingServer_);
-      if (server != null) {
-      	// find exact server for given project
-        IServer[] servers = ServerUtil.getServersByModule(ResourceUtils.getModule(project), null);
-        boolean foundServer = false;
-        for (int i = 0; i < servers.length; i++) {
-          if (servers[i].equals(server))
-            foundServer = true;
-        }
-        if (!foundServer) {
-          Status mmStatus = ServerUtils.getInstance().modifyModules(env, server, ResourceUtils.getModule(project), true, EnvironmentUtils.getIProgressMonitor(env));
-          if (mmStatus.getSeverity()==Status.ERROR)
-        	return mmStatus;            
-          addedProjectToServer_ = true;
-        }
-      }
-      else {
-        if (!(creationScenario_.booleanValue()) && serviceServerTypeID_ == sampleServerTypeID_) //Client
-        {
-          server = serviceExistingServer_;
-        }
-        else {
-          server = ServerUtils.getInstance().createServer(env, ResourceUtils.getModule(project), serverFactoryId, EnvironmentUtils.getIProgressMonitor(env));
-        }
-        if (server == null) {
-          status = new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_CREATE_SERVER"), Status.ERROR);
-          env.getStatusHandler().reportError(status);
-          return status;
-        }
-        
-        // check if module is already associated
-        IModule[] parentModules = server.getRootModules(ResourceUtils.getModule(project), null);
-        if (parentModules!=null && parentModules.length!=0) {
-          if (!ServerUtil.containsModule(server, ResourceUtils.getModule(project), null)) {        
-            Status mmStatus = ServerUtils.getInstance().modifyModules(env, server, ResourceUtils.getModule(project), true, EnvironmentUtils.getIProgressMonitor(env));
-            if (mmStatus.getSeverity()==Status.ERROR)
-              return mmStatus;     
-          }
-        }        
-    
-      }
-      
-      //
-      String projectURL = ResourceUtils.getWebProjectURL(project, serverFactoryId, server);
-      if (creationScenario_.booleanValue()) {
-        serviceExistingServer_ = server;
-        serviceProjectURL_ = projectURL;
-        if (serviceServerTypeID_.equals(sampleServerTypeID_) && clientIds_.getServerInstanceId()==null){
-        	sampleExistingServer_ = serviceExistingServer_;
-        }
-      }
-      else {
-        sampleExistingServer_ = server;
-        sampleProjectURL_ = projectURL;
-      }
-      return status;
-    }
-    catch (Exception e) {
-      status = new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_BAD_SERVER_CONFIG"), Status.ERROR, e);
-      env.getStatusHandler().reportError(status);
-      return status;
-    }
-  }
-
-  public void setServiceProject(IProject serviceProject) {
-    serviceProject_ = serviceProject;
-  }
-
-  public void setSampleProject(IProject sampleProject) {
-    sampleProject_ = sampleProject;
-  }
-
-  public void setServiceServerTypeID(String serviceServerTypeID) {
-    serviceServerTypeID_ = serviceServerTypeID;
-  }
-
-  public void setSampleServerTypeID(String sampleServerTypeID) {
-    sampleServerTypeID_ = sampleServerTypeID;
-  }
-
-  public void setServiceExistingServer(IServer serviceExistingServer) {
-    serviceExistingServer_ = serviceExistingServer;
-  }
-
-  public IServer getServiceExistingServer() {
-    return serviceExistingServer_;
-  }
-
-  public String getServiceExistingServerInstId() {
-	String id = null;
-	IServerWorkingCopy wc = null;
-
-	if (serviceExistingServer_!=null){
-	  wc = serviceExistingServer_.createWorkingCopy();
-	  id = (wc!=null ? wc.getId() : null);
-	}
-
-	return id;
-  }
-
-  public String getSampleExistingServerInstId(){
-	String id = null;
-	IServerWorkingCopy wc = null;
-	if (sampleExistingServer_!=null){
-	  wc = sampleExistingServer_.createWorkingCopy();
-	  id = (wc!=null ? wc.getId() : null);
-	}
-
-	return id;
-	
-  }
-  
-  public void setSampleExistingServer(IServer sampleExistingServer) {
-    sampleExistingServer_ = sampleExistingServer;
-  }
-
-  public IServer getSampleExistingServer() {
-    return sampleExistingServer_;
-  }
-
-  public String getServiceProjectURL() {
-    return serviceProjectURL_;
-  }
-
-  public String getSampleProjectURL() {
-    return sampleProjectURL_;
-  }
-  
-  public void setClientTypeRuntimeServer(TypeRuntimeServer clientId){
-  	this.clientIds_ = clientId;
-  }
-  
-  /**
-   * @return Returns the addedProjectToServer_.
-  */
-  public boolean getAddedProjectToServer() {
-    return addedProjectToServer_;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/StartProjectCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/StartProjectCommand.java
deleted file mode 100644
index 1e06170..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/StartProjectCommand.java
+++ /dev/null
@@ -1,169 +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.consumption.command.common;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.ws.internal.common.EnvironmentUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.jst.ws.internal.consumption.common.WebServiceStartServerRegistry;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.server.core.IServer;
-
-public class StartProjectCommand extends SimpleCommand {
-
-private java.lang.String DESCRIPTION = "Start Web Project";
-private java.lang.String LABEL = "StartProjectCommand";
-private MessageUtils msgUtils_;
-
-private Boolean creationScenario_ = Boolean.TRUE;
-
-private boolean isWebProjectStartupRequested_;
-private IProject serviceProject_;
-private IProject sampleProject_;
-private String serviceServerTypeID_;
-private String sampleServerTypeID_;
-private IServer serviceExistingServer_;
-private IServer sampleExistingServer_;
-
-// rm private Model model_;
-
-/**
- * Default CTOR;
- */
-public StartProjectCommand() {
-	String pluginId = "org.eclipse.jst.ws.consumption";
-	msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-	setDescription(DESCRIPTION);
-	setName(LABEL);    
-    //TODO setRunInWorkspaceModifyOperation(false);
-}
-
-/**
- * Default CTOR;
- */
-public StartProjectCommand(boolean creationScenario ) {
-	String pluginId = "org.eclipse.jst.ws.consumption";
-	msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-	setDescription(DESCRIPTION);
-	setName(LABEL);
-	
-	//TODO setRunInWorkspaceModifyOperation(false);
-	creationScenario_ = new Boolean(creationScenario);
-}
-
-/**
- * Execute the command
- */
-public Status execute(Environment env)
-{
-    
-  
-    Status status = new SimpleStatus( "" );
-    env.getProgressMonitor().report(msgUtils_.getMessage("PROGRESS_INFO_START_WEB_PROJECT"));
-    
-    
-    IProject project = ((creationScenario_.booleanValue()) ? serviceProject_ : sampleProject_);
-    String serverTypeID = ((creationScenario_.booleanValue()) ? serviceServerTypeID_ : sampleServerTypeID_);
-    IServer server = ((creationScenario_.booleanValue()) ? serviceExistingServer_ : sampleExistingServer_);   
-    if (serverTypeID == null && server!=null) {
-    	serverTypeID = server.getServerType().getId();
-    }
-    if (project == null)
-    {
-      status = new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_PROJECT_NOT_FOUND"), Status.ERROR);  
-      env.getStatusHandler().reportError(status);
-      return status;
-    }	
-    IServer instance = ServerUtils.getServerForModule(ResourceUtils.getModule(project), serverTypeID, server, true, EnvironmentUtils.getIProgressMonitor(env));
-    if (instance == null)
-    {
-      status = new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_INSTANCE_NOT_FOUND"), Status.ERROR);
-      env.getStatusHandler().reportError(status);
-      return status;
-    }
-
-   try
-   	{
-   		AbstractStartServer startServerCommand = null;
-   		WebServiceStartServerRegistry reg = WebServiceStartServerRegistry.getInstance();
-     	startServerCommand = (AbstractStartServer)reg.getServerStartByTypeId(instance.getServerType().getId());
-    	startServerCommand.StartServer(project, instance, EnvironmentUtils.getIProgressMonitor(env), isWebProjectStartupRequested_);
-    	return status;
-   	}
-  catch (CoreException ce )
-  	{
-    	IStatus embeddedStatus = ce.getStatus();
-    	status = EnvironmentUtils.convertIStatusToStatus(embeddedStatus);
-    	env.getStatusHandler().reportError(status);
-  		return status;
-  	}
-   catch (Exception e)
-   	{
-       status = new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_SERVER"), Status.ERROR, e);
-       env.getStatusHandler().reportError(status);
-   	   return status;
-   	}
-   
-}
-
-public void setCreationScenario(Boolean creationScenario)
-{
-	creationScenario_ = creationScenario;
-}
-
-public void setServiceProject(IProject serviceProject)
-{
-  serviceProject_ = serviceProject;
-}
-
-public void setSampleProject(IProject sampleProject)
-{
-  sampleProject_ = sampleProject;
-}
-
-public void setServiceServerTypeID(String serviceServerTypeID)
-{
-  serviceServerTypeID_ = serviceServerTypeID;
-}
-
-public void setSampleServerTypeID(String sampleServerTypeID)
-{
-  sampleServerTypeID_ = sampleServerTypeID;
-}
-
-public void setServiceExistingServer(IServer serviceExistingServer)
-{
-  serviceExistingServer_ = serviceExistingServer;
-  if (serviceExistingServer_ != null)
-    setServiceServerTypeID(serviceExistingServer_.getServerType().getId());
-}
-
-public void setSampleExistingServer(IServer sampleExistingServer)
-{
-  sampleExistingServer_ = sampleExistingServer;
-  if (sampleExistingServer_ != null)
-    setSampleServerTypeID(sampleExistingServer_.getServerType().getId());
-}
-
-public void setIsWebProjectStartupRequested(boolean webProjectStartupRequested)
-{
-  isWebProjectStartupRequested_ = webProjectStartupRequested;
-}
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/StartServerCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/StartServerCommand.java
deleted file mode 100644
index b59e99d..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/StartServerCommand.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.eclipse.jst.ws.internal.consumption.command.common;
-
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-
-public class StartServerCommand extends SimpleCommand
-{
-	private String serverInstanceId;
-	
-	public Status execute(Environment env)
-	{
-		return new SimpleStatus("");
-	}
-
-	public void setServerInstanceId(String serverInstanceId)
-	{
-		this.serverInstanceId = serverInstanceId;
-	}	
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/StartTomcatServer.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/StartTomcatServer.java
deleted file mode 100644
index 508bc4d..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/StartTomcatServer.java
+++ /dev/null
@@ -1,38 +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.consumption.command.common;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.wst.server.core.IServer;
-
-public class StartTomcatServer extends AbstractStartServer {
-	
-	protected void addJarsToClassPath(IServer tInstance) throws CoreException {
-
-	}
-
-	protected void validateRemoteServerPath(IServer server)
-			throws CoreException {
-	}
-
-	public void stopServer(IServer server) throws CoreException {
-
-		if (server != null) {
-
-			if (server.getServerState() != IServer.STATE_STOPPED) {
-				server.synchronousStop(false);
-			}
-		}
-
-	}
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/FolderResourceFilter.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/FolderResourceFilter.java
deleted file mode 100644
index 5c0328d..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/FolderResourceFilter.java
+++ /dev/null
@@ -1,98 +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.consumption.common;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.common.AnyFilter;
-import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin;
-
-
-/**
-* This is a kind of {@link Filter} that accepts only objects
-* which indicate a Java resource. In particular, any
-* {@link org.eclipse.core.resources.IResource} whose
-* pathname, or any object whose string representation as
-* returned by <code>toString()</code>, ends in
-* "<code>.java</code>" or "<code>.class</code>" will be accepted.
-* All other objects will be rejected.
-*/
-public class FolderResourceFilter extends AnyFilter
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  /**
-  * Constructs a new <code>JavaResourceFilter</code> that filters
-  * "<code>.java</code>" and "<code>.class</code>" objects.
-  * Equivalent to <code>JavaResourceFilter(ALL_FILES)</code>.
-  */
-  public FolderResourceFilter () { }
-
- /**
-  * Returns the locale-specific name of this filter.
-  * @return The locale-specific name of this filter.
-  */
-  public String getName ()
-  {
-    return WebServiceConsumptionPlugin.getMessage("%FOLDER_FILTER_NAME");
-  }
-
-  /**
-  * Returns the locale-specific description of this filter.
-  * @return The locale-specific description of this filter.
-  */
-  public String getDescription ()
-  {
-    return WebServiceConsumptionPlugin.getMessage("%FOLDER_FILTER_DESC");
-  }
-
- public IStatus statusOf ( Object object )
-  {
-    if (object == null)
-    {
-      return new Status(
-        IStatus.ERROR,
-        WebServiceConsumptionPlugin.ID,
-        0,
-        WebServiceConsumptionPlugin.getMessage("%FILTER_MSG_ERROR_NULL_OBJECT"),
-        null
-      );
-    }
-
-    String name = null;
-
-    if (object instanceof IResource)
-    {
-      IResource resource = (IResource)object;
-      name = resource.getFullPath().toString();
-      if (resource.getType() != IResource.FOLDER)
-      {
-        return new Status(
-          IStatus.ERROR,
-          WebServiceConsumptionPlugin.ID,
-          0,
-          WebServiceConsumptionPlugin.getMessage("%FILTER_MSG_ERROR_NOT_FOLDER",new Object[] {name}),
-          null
-        );
-      }
-    }
-    return new Status(IStatus.OK,WebServiceConsumptionPlugin.ID,0,"",null);
-  }
-
-  private boolean acceptsName ( String name )
-  {
-    return true;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/IServerDefaulter.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/IServerDefaulter.java
deleted file mode 100644
index fc1f1d9..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/IServerDefaulter.java
+++ /dev/null
@@ -1,36 +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.consumption.common;
-
-import org.eclipse.core.resources.IProject;
-
-
-/**
- * Implement this interface to provide logic that can be plugged into
- * the server defaulting algorithm. 
- * (See the org.eclipse.jst.ws.consumption.serverDefaulter extension point)  
- */
-public interface IServerDefaulter
-{
-  
-  /**
-   * @param project
-   * @return ServerInfo. 
-   * If no existing server or server type is recommended, return null.
-   * If a server type is recommended, return an instance of ServerInfo with a non-null
-   * non-empty String for the serverFactoryId and null for the serverInstanceId.
-   * If a server instance is recommended, return an instance of ServerInfo with a non-null
-   * non-empty String for the serverFactoryId and the serverInstanceId.
-   */
-  public ServerInfo recommendDefaultServer(IProject project);
-  
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/JavaResourceFilter.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/JavaResourceFilter.java
deleted file mode 100644
index fc44f91..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/JavaResourceFilter.java
+++ /dev/null
@@ -1,169 +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.consumption.common;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.common.AnyFilter;
-import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin;
-
-
-/**
-* This is a kind of {@link Filter} that accepts only objects
-* which indicate a Java resource. In particular, any
-* {@link org.eclipse.core.resources.IResource} whose
-* pathname, or any object whose string representation as
-* returned by <code>toString()</code>, ends in
-* "<code>.java</code>" or "<code>.class</code>" will be accepted.
-* All other objects will be rejected.
-*/
-public class JavaResourceFilter extends AnyFilter
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  /**
-  * A <code>JavaResourceFilter</code> constructed with this value will
-  * accept "<code>.java</code>", but not "<code>.class</code>", objects.
-  */
-  public static final byte JAVA_FILES = (byte)1;
-
-  /**
-  * A <code>JavaResourceFilter</code> constructed with this value will
-  * accept "<code>.class</code>", but not "<code>.java</code>", objects.
-  */
-  public static final byte CLASS_FILES = (byte)2;
-
-  /**
-  * A <code>JavaResourceFilter</code> constructed with this value will
-  * accept both "<code>.java</code>" and "<code>.class</code>" objects.
-  */
-  public static final byte ALL_FILES = (byte)255;
-
-  private byte extensions_;
-
-  /**
-  * Constructs a new <code>JavaResourceFilter</code> that filters
-  * "<code>.java</code>" and "<code>.class</code>" objects.
-  * Equivalent to <code>JavaResourceFilter(ALL_FILES)</code>.
-  */
-  public JavaResourceFilter ()
-  {
-    this(ALL_FILES);
-  }
-
-  /**
-  * Constructs a new <code>JavaResourceFilter</code> that filters
-  * "<code>.java</code>" objects, "<code>.class</code>" objects,
-  * or both if the value of <code>extensions</code> is
-  * {@link #JAVA_FILES}, {@link #CLASS_FILES} or {@link #ALL_FILES}
-  * respectively.
-  * @param extensions One of
-  * {@link #JAVA_FILES}, {@link #CLASS_FILES} or {@link #ALL_FILES}.
-  */
-  public JavaResourceFilter ( byte extensions )
-  {
-    extensions_ = extensions;
-  }
-
-  /**
-  * Returns the locale-specific name of this filter.
-  * @return The locale-specific name of this filter.
-  */
-  public String getName ()
-  {
-    return WebServiceConsumptionPlugin.getMessage("%JAVA_FILTER_NAME");
-  }
-
-  /**
-  * Returns the locale-specific description of this filter.
-  * @return The locale-specific description of this filter.
-  */
-  public String getDescription ()
-  {
-    return WebServiceConsumptionPlugin.getMessage("%JAVA_FILTER_DESC");
-  }
-
-  /**
-  * Returns an {@link org.eclipse.core.runtime.IStatus}
-  * describing the <code>Filter</code>'s assessment of
-  * the given <code>object</code>.
-  * See {@link Filter#statusOf} for general comments.
-  * @param object The object to filter.
-  * @return An {@link org.eclipse.core.runtime.IStatus}
-  * indicating whether or not if the given <code>object</code>
-  * represents a Java resource.
-  */
-  public IStatus statusOf ( Object object )
-  {
-    if (object == null)
-    {
-      return new Status(
-        IStatus.ERROR,
-        WebServiceConsumptionPlugin.ID,
-        0,
-        WebServiceConsumptionPlugin.getMessage("%FILTER_MSG_ERROR_NULL_OBJECT"),
-        null
-      );
-    }
-
-    String name = null;
-
-    if (object instanceof IResource)
-    {
-      IResource resource = (IResource)object;
-      name = resource.getFullPath().toString();
-      if (resource.getType() != IResource.FILE)
-      {
-        return new Status(
-          IStatus.ERROR,
-          WebServiceConsumptionPlugin.ID,
-          0,
-          WebServiceConsumptionPlugin.getMessage("%FILTER_MSG_ERROR_NOT_FILE",new Object[] {name}),
-          null
-        );
-      }
-    }
-
-    if (name == null)
-    {
-      name = object.toString();
-    }
-
-    if (!acceptsName(name))
-    {
-      return new Status(
-        IStatus.ERROR,
-        WebServiceConsumptionPlugin.ID,
-        0,
-        WebServiceConsumptionPlugin.getMessage("%JAVA_FILTER_MSG_ERROR_WRONG_EXTENSION",new Object[] {name}),
-        null
-      );
-    }
-
-    return new Status(IStatus.OK,WebServiceConsumptionPlugin.ID,0,"",null);
-  }
-
-  //
-  // Checks if the given name is acceptable based upon its extension
-  // and the value of the extensions_ bitmask.
-  //
-  private boolean acceptsName ( String name )
-  {
-    return ( 
-      (name.endsWith(".java") && ((extensions_ & JAVA_FILES) != 0)) ||
-      (name.endsWith(".class") && ((extensions_ & CLASS_FILES) != 0))
-    );
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/MappingUtils.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/MappingUtils.java
deleted file mode 100644
index 25e84f7..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/MappingUtils.java
+++ /dev/null
@@ -1,84 +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.consumption.common;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-
-
-/**
-* This class contains useful methods for working with Server plugin functions
-*/
-public final class MappingUtils
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  private static final String DEFAULT_SERVICE_EXT = "Service.wsdl";
-  private static final String DEFAULT_BINDING_EXT = "Binding.wsdl";
-  private static final String DEFAULT_V4_SERVICE_EXT = "-service.wsdl";
-  private static final String DEFAULT_V4_BINDING_EXT = "-binding.wsdl";
-  private static final String WSDL_EXTENSION = ".wsdl";
-  private static final String WSDL_FOLDER = "wsdl";
-  public static final String DEFAULT_SKELETON_PACKAGENAME = "service";
-
-  /**
-  * Returns the WSDL folder path
-  * @param project the project
-  */
-  public static IPath getWSDLFolderPath (IProject project)
-  {
-    IPath wsdlFolder=null;
-//  	IPath webModuleServerRoot = ResourceUtils.getWebModuleServerRoot( project ).getFullPath();
-  	IPath webModuleServerRoot = J2EEUtils.getFirstWebContentPath(project);
-  	if (webModuleServerRoot != null )
-  		wsdlFolder = webModuleServerRoot.append(WSDL_FOLDER);
-    return wsdlFolder;
-  }
-    
-
-   /**
-  * Returns the base name based on WSDL file name
-  * @param wsdlName WSDL file name
-  */
-  public static String getBaseName (String wsdlLocation )
-  {
-  	String wsdlName=wsdlLocation;
-  	
-  	int index = wsdlLocation.lastIndexOf('/');
-    if (index!= -1) {
-      wsdlName = wsdlLocation.substring(index+1,wsdlName.length());
-    }
-    
-    String baseName=wsdlName;
-    if ( wsdlName.endsWith(DEFAULT_SERVICE_EXT) ) {
-      baseName = wsdlName.substring(0,(wsdlName.length() - DEFAULT_SERVICE_EXT.length()));
-    } else if ( wsdlName.toLowerCase().endsWith(DEFAULT_V4_SERVICE_EXT) ) {
-      baseName = wsdlName.substring(0,(wsdlName.length() - DEFAULT_V4_SERVICE_EXT.length()));
-    } else if (wsdlName.endsWith(DEFAULT_BINDING_EXT)) {
-      baseName = wsdlName.substring(0,(wsdlName.length()-DEFAULT_BINDING_EXT.length()));
-    } else if (wsdlName.toLowerCase().endsWith(DEFAULT_V4_BINDING_EXT)) {
-      baseName = wsdlName.substring(0,(wsdlName.length()-DEFAULT_V4_BINDING_EXT.length()));
-    } else if (wsdlName.toLowerCase().endsWith(WSDL_EXTENSION)) {
-    	baseName = wsdlName.substring(0,(wsdlName.length() - WSDL_EXTENSION.length()));
-    } else {
-      // no recognizable suffix, just remove extension, if any
-      int index4 = baseName.lastIndexOf('.');
-      if (index4!=-1)
-        baseName = baseName.substring(0, index4);
-    }
-    return baseName;
-  }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/PropertiesResourceFilter.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/PropertiesResourceFilter.java
deleted file mode 100644
index 146b2f1..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/PropertiesResourceFilter.java
+++ /dev/null
@@ -1,125 +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.consumption.common;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.common.AnyFilter;
-import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin;
-
-
-/**
-* This is a kind of {@link Filter} that accepts only objects
-* which indicate a Java resource. In particular, any
-* {@link org.eclipse.core.resources.IResource} whose
-* pathname, or any object whose string representation as
-* returned by <code>toString()</code>, ends in
-* "<code>.java</code>" or "<code>.class</code>" will be accepted.
-* All other objects will be rejected.
-*/
-public class PropertiesResourceFilter extends AnyFilter
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- 
-  /**
-  * Constructs a new <code>JavaResourceFilter</code> that filters
-  * "<code>.java</code>" and "<code>.class</code>" objects.
-  * Equivalent to <code>JavaResourceFilter(ALL_FILES)</code>.
-  */
-  public PropertiesResourceFilter ()
-  {
-    
-  }
-
-  /**
-  * Returns the locale-specific name of this filter.
-  * @return The locale-specific name of this filter.
-  */
-  public String getName ()
-  {
-    return WebServiceConsumptionPlugin.getMessage("%PROPERTIES_FILTER_NAME");
-  }
-
-  /**
-  * Returns the locale-specific description of this filter.
-  * @return The locale-specific description of this filter.
-  */
-  public String getDescription ()
-  {
-    return WebServiceConsumptionPlugin.getMessage("%PROPERTIES_FILTER_DESC");
-  }
-
-  /**
-  * Returns an {@link org.eclipse.core.runtime.IStatus}
-  * describing the <code>Filter</code>'s assessment of
-  * the given <code>object</code>.
-  * See {@link Filter#statusOf} for general comments.
-  * @param object The object to filter.
-  * @return An {@link org.eclipse.core.runtime.IStatus}
-  * indicating whether or not if the given <code>object</code>
-  * represents a Java resource.
-  */
-  public IStatus statusOf ( Object object )
-  {
-    if (object == null)
-    {
-      return new Status(
-        IStatus.ERROR,
-        WebServiceConsumptionPlugin.ID,
-        0,
-        WebServiceConsumptionPlugin.getMessage("%FILTER_MSG_ERROR_NULL_OBJECT"),
-        null
-      );
-    }
-
-    String name = null;
-
-    if (object instanceof IResource)
-    {
-      IResource resource = (IResource)object;
-      name = resource.getFullPath().toString();
-      if (resource.getType() != IResource.FILE)
-      {
-        return new Status(
-          IStatus.ERROR,
-          WebServiceConsumptionPlugin.ID,
-          0,
-          WebServiceConsumptionPlugin.getMessage("%FILTER_MSG_ERROR_NOT_FILE",new Object[] {name}),
-          null
-        );
-      }
-    }
-
-    if (name == null)
-    {
-      name = object.toString();
-    }
-
-	if (!name.endsWith(".properties"))
-    {
-      return new Status(
-        IStatus.ERROR,
-        WebServiceConsumptionPlugin.ID,
-        0,
-        WebServiceConsumptionPlugin.getMessage("%PROPERTIES_FILTER_MSG_ERROR_WRONG_EXTENSION",new Object[] {name}),
-        null
-      );
-    }
-
-    return new Status(IStatus.OK,WebServiceConsumptionPlugin.ID,0,"",null);
-  }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/ServerInfo.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/ServerInfo.java
deleted file mode 100644
index 0625cb2..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/ServerInfo.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
- *******************************************************************************/
-/*
- * Created on Mar 25, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.ws.internal.consumption.common;
-
-/**
- *
- */
-public class ServerInfo
-{
-  String serverFactoryId;
-  String serverInstanceId;
-  /**
-   * @return Returns the serverFactoryId.
-   */
-  public String getServerFactoryId()
-  {
-    return serverFactoryId;
-  }
-  /**
-   * @param serverFactoryId The serverFactoryId to set.
-   */
-  public void setServerFactoryId(String serverFactoryId)
-  {
-    this.serverFactoryId = serverFactoryId;
-  }
-  /**
-   * @return Returns the serverInstanceId.
-   */
-  public String getServerInstanceId()
-  {
-    return serverInstanceId;
-  }
-  /**
-   * @param serverInstanceId The serverInstanceId to set.
-   */
-  public void setServerInstanceId(String serverInstanceId)
-  {
-    this.serverInstanceId = serverInstanceId;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/WSDLParserFactory.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/WSDLParserFactory.java
deleted file mode 100644
index a05af71..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/WSDLParserFactory.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 Eclipse Public License v1.0
- * which accompanies 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.consumption.common;
-
-import org.eclipse.wst.ws.parser.discovery.WebServicesParserExt;
-import org.eclipse.wst.ws.parser.wsil.WebServicesParser;
-
-/**
- * 
- * The factory class can be used to get at a single instance of the
- * WSDL parser.  Note:  This class is temporary.  We will probably come
- * up with a better method of handling passing around the parser.
- *
- */
-public class WSDLParserFactory 
-{
-  private static WebServicesParserExt parser_;
-  
-  private WSDLParserFactory()
-  {
-  }
-  
-  public static WebServicesParser getWSDLParser()
-  {
-    if( parser_ == null )
-	{
-	  parser_ = new WebServicesParserExt();
-	}
-	
-	return parser_;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/WSDLResourceFilter.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/WSDLResourceFilter.java
deleted file mode 100644
index 7872f6d..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/WSDLResourceFilter.java
+++ /dev/null
@@ -1,120 +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.consumption.common;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.common.AnyFilter;
-import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin;
-
-
-/**
-* This is a kind of {@link Filter} that accepts only objects
-* which indicate a WSDL resource. In particular, any
-* {@link org.eclipse.core.resources.IResource} whose
-* pathname, or any object whose string representation as
-* returned by <code>toString()</code>, ends in
-* "<code>.wsdl</code>" will be accepted.
-* All other objects will be rejected.
-*/
-public class WSDLResourceFilter extends AnyFilter
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  /**
-  * Constructs a new <code>WSDLResourceFilter</code>.
-  */
-  public WSDLResourceFilter ()
-  {
-  }
-
-  /**
-  * Returns the locale-specific name of this filter.
-  * @return The locale-specific name of this filter.
-  */
-  public String getName ()
-  {
-    return WebServiceConsumptionPlugin.getMessage("%WSDL_FILTER_NAME");
-  }
-
-  /**
-  * Returns the locale-specific description of this filter.
-  * @return The locale-specific description of this filter.
-  */
-  public String getDescription ()
-  {
-    return WebServiceConsumptionPlugin.getMessage("%WSDL_FILTER_DESC");
-  }
-
-  /**
-  * Returns an {@link org.eclipse.core.runtime.IStatus}
-  * describing the <code>Filter</code>'s assessment of
-  * the given <code>object</code>.
-  * See {@link Filter#statusOf} for general comments.
-  * @param object The object to filter.
-  * @return An {@link org.eclipse.core.runtime.IStatus}
-  * indicating whether or not if the given <code>object</code>
-  * represents a WSDL resource.
-  */
-  public IStatus statusOf ( Object object )
-  {
-    if (object == null)
-    {
-      return new Status(
-        IStatus.ERROR,
-        WebServiceConsumptionPlugin.ID,
-        0,
-        WebServiceConsumptionPlugin.getMessage("%FILTER_MSG_ERROR_NULL_OBJECT"),
-        null
-      );
-    }
-
-    String name = null;
-
-    if (object instanceof IResource)
-    {
-      IResource resource = (IResource)object;
-      name = resource.getFullPath().toString();
-      if (resource.getType() != IResource.FILE)
-      {
-        return new Status(
-          IStatus.ERROR,
-          WebServiceConsumptionPlugin.ID,
-          0,
-          WebServiceConsumptionPlugin.getMessage("%FILTER_MSG_ERROR_NOT_FILE",new Object[] {name}),
-          null
-        );
-      }
-    }
-
-    if (name == null)
-    {
-      name = object.toString();
-    }
-
-    if (!name.endsWith(".wsdl"))
-    {
-      return new Status(
-        IStatus.ERROR,
-        WebServiceConsumptionPlugin.ID,
-        0,
-        WebServiceConsumptionPlugin.getMessage("%WSDL_FILTER_MSG_ERROR_WRONG_EXTENSION",new Object[] {name}),
-        null
-      );
-    }
-
-    return new Status(IStatus.OK,WebServiceConsumptionPlugin.ID,0,"",null);
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/WebServiceStartServerRegistry.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/WebServiceStartServerRegistry.java
deleted file mode 100644
index dd1f3dd..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/WebServiceStartServerRegistry.java
+++ /dev/null
@@ -1,101 +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.consumption.common;
-
-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;
-import org.eclipse.wst.command.env.core.common.Log;
-import org.eclipse.wst.command.env.eclipse.EclipseLog;
-
-
-
-/**
-* This is the registry of WebServiceStartServerType objects.
-*/
-public class WebServiceStartServerRegistry
-{
-
-  private static WebServiceStartServerRegistry instance_;
-  private Hashtable StartServerTypes;
-
-  //
-  // Loads WebServiceStartServerType objects into this registry.
-  // See method getInstance().
-  //
-  private void load ()
-  {
-    StartServerTypes = new Hashtable();
-    IExtensionRegistry reg = Platform.getExtensionRegistry();
-    IConfigurationElement[] config = reg.getConfigurationElementsFor(
-                                     "org.eclipse.jst.ws.consumption",
-                                     "webServiceStartServerType");
-
-    for(int idx=0; idx<config.length; idx++) 
-    {
-      IConfigurationElement elem = config[idx];
-      try 
-      {
-          String factoryId_ = elem.getAttribute("factoryId");
-		  StartServerTypes.put(factoryId_, elem);
-	  
-      } 
-      catch (Exception e)
-      {
-        EclipseLog log = new EclipseLog();
-        log.log(Log.ERROR, 5047, this, "load", e);
-      }
-      
-    }
-  }
-
-  /**
-  * Returns a singleton instance of this class.
-  * @return A singleton WebServiceStartServerRegistry object.
-  */
-  public static WebServiceStartServerRegistry getInstance ()
-  {
-    if (instance_ == null)
-    {
-      instance_ = new WebServiceStartServerRegistry();
-      instance_.load();
-    }
-    return instance_;
-  }
-
-   public Object getServerStartByTypeId (String typeID) throws CoreException
-   {
-    if (typeID==null)
-      return null;
-    return ((IConfigurationElement)StartServerTypes.get(typeID)).createExecutableExtension("class");
-  }
-  
-   public boolean isRemoveEARRequired(String typeId) throws CoreException {
-   	if (typeId!=null) {
-   		IConfigurationElement elem = (IConfigurationElement)StartServerTypes.get(typeId);
-   		if (elem!=null){
-   			String value = elem.getAttribute("removeEAR");
-   			if (value!=null){
-   				return Boolean.valueOf(value).booleanValue();
-   			}
-   		}
-   	}
-	return true;   		 
-   }   
-}
-
-
-
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/ArrayElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/ArrayElement.java
deleted file mode 100644
index c07aa72..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/ArrayElement.java
+++ /dev/null
@@ -1,99 +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.consumption.datamodel.beanmodel;
-
-import org.eclipse.wst.ws.internal.datamodel.BasicModel;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-
-/**
-* Objects of this class represent a Java bean.
-* Nearest moral equivalents: java.lang.Class, java.beans.BeanDescriptor.
-*/
-public class ArrayElement extends TypeElement
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-  public static String ARRAY_NAME = "10101010array10101010";
-  public static String REL_METHODS = "relmethods";
- 
-  /**
-  * Constructor 
-  * @param projectElement The project this Bean belongs to.
-  */
-  public ArrayElement (String name)
-  {
-    this(name,new BasicModel("Project"),true);
-  }
-
-  /**
-  * Constructor 
-  * @param parameterElement The parameter this Bean belongs to.
-  */
-  public ArrayElement (String name, Model model,boolean isRoot)
-  {
-    super(name,model,TypeElement.ARRAY);
-    if(isRoot) model.setRootElement(this);
-    fOwnerType = TypeElement.ROOT;
-  }
-  
-  
-  /**
-  * Constructor for the case when this is not the root object
-  * here it represents complex types
-  * @param ParameterElement The Parameter that owns this bean type.
-  * @param String Name of the bean element.
-  */
-  public ArrayElement ( ParameterElement parameterElement, String name)
-  {
-    super(name,parameterElement,TypeElement.REL_OWNER,TypeElement.REL_TYPE,TypeElement.ARRAY);
-    fOwnerType = TypeElement.PARAMETER_OWNER;
-  }
-
-  /**
-  * Constructor for the case when this is not the root object
-  * here it represents complex types
-  * @param ParameterElement The Parameter that owns this bean type.
-  * @param String Name of the ParameterElement.
-  */
-  public ArrayElement ( AttributeElement attributeElement, String name)
-  {
-    super(name,attributeElement,TypeElement.REL_OWNER,TypeElement.REL_TYPE,TypeElement.ARRAY);
-    fOwnerType = TypeElement.ATTRIBUTE_OWNER;
-  }
-
-  /**
-  * Constructor for the case when this is not the root object
-  * here it represents complex types
-  * @param FieldElement The Parameter that owns this bean type.
-  * @param String Name of the ParameterElement.
-  */
-  public ArrayElement ( FieldElement fieldElement, String name)
-  {
-    super(name,fieldElement,TypeElement.REL_OWNER,TypeElement.REL_TYPE,TypeElement.ARRAY);
-    fOwnerType = TypeElement.FIELD_OWNER;
-  }
-
-
-  /*
-  * determine wether this is an object array or
-  * primitive array
-  */
-  public String getTypeName()
-  {
-    return ARRAY_NAME + getName();
-  }
-
- 
-  
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/ArrayType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/ArrayType.java
deleted file mode 100644
index 3d8c7e4..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/ArrayType.java
+++ /dev/null
@@ -1,65 +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.consumption.datamodel.beanmodel;
-
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-
-
-/**
-* objects of this class represent a recognized return type
-* 
-*/
-public class ArrayType extends RecognizedReturnType
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  private String fTypeName;
-
-  /**
-  *Constructor
-  *
-  */
-  public ArrayType(String typeName)
-  {
-    this(TypeFactory.ARRAY_NAME,typeName);
-  }
-
-  public ArrayType(String name,String typeName)
-  {
-    super(name);
-    fTypeName = typeName;
-  } 
-
- 
-   /**
-  * This is basically the function that dictates how we want to display this type 
-  * upon receiving it as a return from a proxy method
-  * @param String the name of the type
-  * @return String The display string
-  */
-  public String TypeConversion(String name)
-  {
-     
-    String nonBean = Generator.DOUBLE_TAB + "java.util.List list" + getUniqueName() + "= java.util.Arrays.asList(" + name + ");" +StringUtils.NEWLINE
-    	             + Generator.DOUBLE_TAB + "String temp"+ getUniqueName() +" = list" + getUniqueName() + ".toString();" + StringUtils.NEWLINE 
-                     + Generator.DOUBLE_TAB + "%>" + StringUtils.NEWLINE  
-    	             + Generator.DOUBLE_TAB + "<%=temp"+ getUniqueName() +"%>" + StringUtils.NEWLINE
-                     + Generator.DOUBLE_TAB + "<%"+ StringUtils.NEWLINE;
-
-    return nonBean;
-  }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/AttributeElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/AttributeElement.java
deleted file mode 100644
index 720679f..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/AttributeElement.java
+++ /dev/null
@@ -1,96 +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.consumption.datamodel.beanmodel;
-
-import java.util.Enumeration;
-
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-
-
-/**
-* Objects of this class represent a Java bean method parameter.
-* Nearest moral equivalents: java.beans.ParameterDescriptor.
-*/
-public class AttributeElement extends BasicElement implements AttributeElementType
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- 
-  public static final String REL_TYPE = "type";
-  public static final String REL_OWNING_BEAN = "owningbean";
-
-  private String fSetterMethod;
-  private String fGetterMethod;
-
-  /**
-  * Constructor this takes the owning bean.
-  * @param name The name of the attribute.
-  * @param beanElement the bean that owns this attribute.
-  */
-  public AttributeElement ( BeanElement beanElement, String name)
-  {
-    super(name,beanElement,REL_OWNING_BEAN,BeanElement.REL_ATTRIBUTES);
-  }
-  
-  public void setSetterMethod(String setterMethod)
-  {
-    fSetterMethod = setterMethod;
-  }
-
-  public String getSetterMethod()
-  {
-    return fSetterMethod;
-  }
-
-  public String getGetterMethod()
-  {
-    return fGetterMethod;
-  }
- 
-  public void setGetterMethod(String getterMethod)
-  {
-    fGetterMethod = getterMethod;
-  }
-
-  public String getSetterSignature(String attribute)
-  {
-    int bracket = fSetterMethod.indexOf("(");
-    bracket++;
-    String setter = fSetterMethod.substring(0,bracket);
-    String fullSetter = setter + attribute + ");";
-   
-    return fullSetter;
-  }
-
-  /**
-  * Returns the Bean that owns this Attribute.
-  * @return BeanElement The bean that owns this attribute.
-  */
-  public BeanElement getOwningBeanElement ()
-  {
-    Enumeration e = getElements(REL_OWNING_BEAN);
-    return e.hasMoreElements() ? (BeanElement)e.nextElement() : null;
-  }
-
-  /**
-  * Returns the type that is owned by this attributte.
-  * @return TypeElement The Type that of this attribute.
-  */
-  public TypeElement getTypeElement ()
-  {
-    Enumeration e = getElements(REL_TYPE);
-    return e.hasMoreElements() ? (TypeElement)e.nextElement() : null;
-  }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/AttributeElementType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/AttributeElementType.java
deleted file mode 100644
index 0b0b6fc..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/AttributeElementType.java
+++ /dev/null
@@ -1,39 +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.consumption.datamodel.beanmodel;
-
-
-/**
-* Objects of this class represent a Java bean method parameter.
-* Nearest moral equivalents: java.beans.ParameterDescriptor.
-*/
-public interface AttributeElementType 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-   
-  public void setSetterMethod(String setterMethod);
-  public String getSetterMethod();
-  public String getGetterMethod();
-  public void setGetterMethod(String getterMethod);
-  public BeanElement getOwningBeanElement ();
-  public TypeElement getTypeElement ();
-  /**
-  * Return the signature with this value as the parmeter
-  *
-  */
-  public String getSetterSignature(String attribute);
-  
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/BeanElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/BeanElement.java
deleted file mode 100644
index 853da9c..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/BeanElement.java
+++ /dev/null
@@ -1,124 +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.consumption.datamodel.beanmodel;
-
-import java.util.Enumeration;
-
-import org.eclipse.wst.ws.internal.datamodel.BasicModel;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-
-
-/**
-* Objects of this class represent a Java bean.
-* Nearest moral equivalents: java.lang.Class, java.beans.BeanDescriptor.
-*/
-public class BeanElement extends TypeElement
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-  public static String STATELESS_BEAN = "10101010statelessbean10101010";
-  public static String REL_METHODS = "relmethods";
- 
-  /**
-  * Constructor 
-  * @param projectElement The project this Bean belongs to.
-  */
-  public BeanElement (String name)
-  {
-    this(name,new BasicModel("Project"),true);
-  }
-
-  /**
-  * Constructor 
-  * @param parameterElement The parameter this Bean belongs to.
-  */
-  public BeanElement (String name, Model model,boolean isRoot)
-  {
-    super(name,model,TypeElement.BEAN);
-    if(isRoot) model.setRootElement(this);
-    fOwnerType = TypeElement.ROOT;
-  }
-
-  /**
-  * Constructor for the case when this is not the root object
-  * here it represents complex types
-  * @param ParameterElement The Parameter that owns this bean type.
-  * @param String Name of the bean element.
-  */
-  public BeanElement ( ParameterElement parameterElement, String name)
-  {
-    super(name,parameterElement,TypeElement.REL_OWNER,TypeElement.REL_TYPE,TypeElement.BEAN);
-    fOwnerType = TypeElement.PARAMETER_OWNER;
-  }
-
-  /**
-  * Constructor for the case when this is not the root object
-  * here it represents complex types
-  * @param ParameterElement The Parameter that owns this bean type.
-  * @param String Name of the ParameterElement.
-  */
-  public BeanElement ( AttributeElement attributeElement, String name)
-  {
-    super(name,attributeElement,TypeElement.REL_OWNER,TypeElement.REL_TYPE,TypeElement.BEAN);
-    fOwnerType = TypeElement.ATTRIBUTE_OWNER;
-  
-  }
-
-   /**
-  * Constructor for the case when this is not the root object
-  * here it represents complex types
-  * @param ParameterElement The Parameter that owns this bean type.
-  * @param String Name of the ParameterElement.
-  */
-  public BeanElement ( FieldElement fieldElement, String name)
-  {
-    super(name,fieldElement,TypeElement.REL_OWNER,TypeElement.REL_TYPE,TypeElement.BEAN);
-    fOwnerType = TypeElement.FIELD_OWNER;
-  
-  }
-
-  /**
-  * Returns an enumeration of all Method objects of this Bean.
-  * @return Enumeration All Method objects of this Bean.
-  */
-  public Enumeration getMethods ()
-  {
-    return getElements(REL_METHODS);
-  }
-
-  /**
-  * Returns the number of Method objects of this Bean.
-  * @return int The number of Method objects of this Bean.
-  */
-  public int getNumberOfMethodElements ()
-  {
-    return getNumberOfElements(REL_METHODS);
-  }
-
-  public String getTypeName()
-  {
-    if(isStateLess()) return STATELESS_BEAN + getName();
-    return getName();
-  }
-
-  public boolean isStateLess()
-  {
-    Enumeration ea = getElements(TypeElement.REL_ATTRIBUTES);
-    Enumeration ef = getElements(TypeElement.REL_FIELDS);
-    if(ea.hasMoreElements() || ef.hasMoreElements()) return false;
-    else return true;
-  }
-
-  
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/BeanModelElementsFactory.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/BeanModelElementsFactory.java
deleted file mode 100644
index 1ed7992..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/BeanModelElementsFactory.java
+++ /dev/null
@@ -1,168 +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.consumption.datamodel.beanmodel;
-
-import org.eclipse.jem.java.Field;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.JavaParameter;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.ws.internal.consumption.sampleapp.common.SamplePropertyDescriptor;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-
-/**
- * TypeFactory
- * Creation date: (4/10/2001 12:41:48 PM)
- * @author: Gilbert Andrews
- */
-public class BeanModelElementsFactory 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-  public static final String RETURN_PARAM_NAME="returnp";
-
-  private BeanModelElementsFactory(){}
-
-  public static Element getBeanModelElement(Object object)
-  {
-    return BeanModelElementsFactory.getBeanModelElement(object,null,null);
-  }
-
-  public static Element getBeanModelElement(Object object,Element parentElement)
-  {
-    return BeanModelElementsFactory.getBeanModelElement(object,parentElement,null);
-  }
-  
- /*
-  * Take in an object and return an element depending on what 
-  * type we are dealing with from the javamof
-  **/
-  public static Element getBeanModelElement(Object object,Element parentElement, Model model)
-  {
-    Element returnElement = null;
-
-    if (object instanceof JavaClass){
-      JavaClass javaClass = (JavaClass)object;
-      String javaName = javaClass.getJavaName();
-      if (!javaClass.isArray()){ 
-	      if(parentElement == null && model ==null) returnElement = new BeanElement(javaName);
-	      else if(parentElement == null && model !=null) returnElement = new BeanElement(javaName,model,false);
-	      else{
-	        if(parentElement instanceof ParameterElement){ 
-	           ParameterElement tempElement = (ParameterElement)parentElement;
-	           returnElement = new BeanElement(tempElement,javaName);
-	        }
-	        else if(parentElement instanceof AttributeElement){
-	           AttributeElement tempElement = (AttributeElement)parentElement;
-	           returnElement = new BeanElement(tempElement,javaName);
-	        }
-            else if(parentElement instanceof FieldElement){
-               FieldElement tempElement = (FieldElement)parentElement;
-	           returnElement = new BeanElement(tempElement,javaName);
-            }
-            else if(parentElement instanceof MethodElement){
-               returnElement = new ParameterElement((MethodElement)parentElement,RETURN_PARAM_NAME,MethodElement.REL_RETURN_PARAMETERS,true);
-            }	         
-	      }
-      } 
-      else{
-          if(parentElement == null && model ==null) returnElement = new ArrayElement(javaName);
-	      else if(parentElement == null && model !=null) returnElement = new ArrayElement(javaName,model,false);
-	      else{
-	        if(parentElement instanceof ParameterElement){ 
-	           ParameterElement tempElement = (ParameterElement)parentElement;
-	           returnElement = new ArrayElement(tempElement,javaName);
-	        }
-	        else if(parentElement instanceof AttributeElement){
-	           AttributeElement tempElement = (AttributeElement)parentElement;
-	           returnElement = new ArrayElement(tempElement,javaName);
-	        }
-            else if(parentElement instanceof FieldElement){
-               FieldElement tempElement = (FieldElement)parentElement;
-	           returnElement = new ArrayElement(tempElement,javaName);
-	        }
-            else if(parentElement instanceof MethodElement){
-               returnElement = new ParameterElement((MethodElement)parentElement,RETURN_PARAM_NAME,MethodElement.REL_RETURN_PARAMETERS,true);
-            }
-
-	      }
-       }
-
-    }
-    else if(object instanceof SamplePropertyDescriptor){
-      SamplePropertyDescriptor pd = (SamplePropertyDescriptor)object;
-      returnElement = new AttributeElement((BeanElement)parentElement,pd.getName());  
-    }
-    else if(object instanceof Field){
-      Field field = (Field)object;
-      returnElement = new FieldElement((BeanElement)parentElement,field.getName());
-    }
-    else if (object instanceof Method){
-      Method method = (Method)object;
-      returnElement = new MethodElement((BeanElement)parentElement,method.getName(), method.getMethodElementSignature());
-    }
-    //non beaninfo
-    else if (object instanceof String){
-      String name = (String)object;  
-      returnElement = new AttributeElement((BeanElement)parentElement,name);
-    }
-    else if (object instanceof JavaParameter){
-      JavaParameter javaParameter = (JavaParameter)object;
-
-      
-      if (javaParameter.isReturn()) 
-         returnElement = new ParameterElement((MethodElement)parentElement,RETURN_PARAM_NAME,MethodElement.REL_RETURN_PARAMETERS,true); 
-      else{ 
-         //a java parameter gives us the qualified name we dont want this
-         String name = javaParameter.getQualifiedName();
-         String shortName;
-         int index = name.lastIndexOf(".");
-         if (index != -1){
-           index++;
-           shortName = name.substring(index);
-         }
-      else shortName = name;
-
-         returnElement = new ParameterElement((MethodElement)parentElement,shortName,MethodElement.REL_PARAMETERS,false); 
-
-      }
-     
-    }
-    else if (object instanceof JavaHelpers){
-      JavaHelpers javaHelper = (JavaHelpers)object;
-      String javaName; 
-      if (javaHelper.isArray()) javaName = TypeFactory.ARRAY_NAME;
-      else javaName = javaHelper.getJavaName();
-      if (parentElement instanceof ParameterElement){
-          returnElement = new SimpleElement((ParameterElement)parentElement,javaName,javaHelper.isPrimitive());
-      }
-      else if(parentElement instanceof AttributeElement){
-          returnElement = new SimpleElement((AttributeElement)parentElement,javaName,javaHelper.isPrimitive());
-      }
-      else if(parentElement instanceof FieldElement){
-          returnElement = new SimpleElement((FieldElement)parentElement,javaName,javaHelper.isPrimitive());
-      }
-      else if(parentElement instanceof MethodElement){
-      	returnElement = new ParameterElement((MethodElement)parentElement,RETURN_PARAM_NAME,MethodElement.REL_RETURN_PARAMETERS,true);
-      }
-    }
-    return returnElement;
-  }
-  
-  
-  
-
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/BigDecimalType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/BigDecimalType.java
deleted file mode 100644
index 24da0c1..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/BigDecimalType.java
+++ /dev/null
@@ -1,56 +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.consumption.datamodel.beanmodel;
-
-/**
-* objects of this class represent a type
-* 
-*/
-public class BigDecimalType extends SimpleType 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  /**
-  *Constructor
-  *
-  */
-  public BigDecimalType()
-  {
-    super(TypeFactory.BIG_DECIMAL_NAME);
-  }
- 
-  /**
-  * StringToType gets the string taken by the 
-  * user into proxy form
-  * @return String convert the string to type .
-  */
-  public String StringToType(String name)
-  {
-    return "new java.math.BigDecimal(" + name + ");";
-  }
-
-  /**
-  * The stringConversion function nails out specific conversion methods used among simple types 
-  * This method is to be implemented by SimpleType subclasses
-  * @param String the name of string after the request call
-  * @return String the actual conversion string containing the name.
-  */
-  public String TypeToString(String name)
-  {
-    return name + ".toString()";
-  }
- 
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/BigIntegerType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/BigIntegerType.java
deleted file mode 100644
index acf6033..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/BigIntegerType.java
+++ /dev/null
@@ -1,56 +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.consumption.datamodel.beanmodel;
-
-/**
-* objects of this class represent a type
-* 
-*/
-public class BigIntegerType extends SimpleType 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  /**
-  *Constructor
-  *
-  */
-  public BigIntegerType()
-  {
-    super(TypeFactory.BIG_INTEGER_NAME);
-  }
- 
-  /**
-  * StringToType gets the string taken by the 
-  * user into proxy form
-  * @return String convert the string to type .
-  */
-  public String StringToType(String name)
-  {
-    return "new java.math.BigInteger(" + name + ");";
-  }
-
-  /**
-  * The stringConversion function nails out specific conversion methods used among simple types 
-  * This method is to be implemented by SimpleType subclasses
-  * @param String the name of string after the request call
-  * @return String the actual conversion string containing the name.
-  */
-  public String TypeToString(String name)
-  {
-    return name + ".toString()";
-  }
- 
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/DataType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/DataType.java
deleted file mode 100644
index 4861a69..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/DataType.java
+++ /dev/null
@@ -1,90 +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.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a type
-* This class is used to simplify the codegen process
-* Because codegen may be processed differently depending on the type
-* we can handle how each type wants the code to look for a specific task 
-* by creating a datatype and calling generic methods that are 
-* to be specialized in subclasses
-*/
-public interface DataType 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  public static String REL_TYPE = "type";
-
-  /**
-  * This function hands back the code required to go from the 
-  * string the user entered to the actual type of the element
-  * @param String typeName this is the actual name of the type ie int,boolean
-  * @param String nodeName The nodeName is just the attributename + Temp. 
-  * @param String the attributeName 
-  * @return String convert the string to type .
-  */
-  public String stringConversion(String typeName, String nodeName, String attributeName);
-
-  /**
-  * Often times in order to convert a type to string, string to type or just plain provide an input form
-  * A temporary variable is used. If we run into a sitution where two of the same types are used in the  
-  * same method these temporary variables share the same name space. It isnt enough to use a name 
-  * because of we may have a nested scenario. Therefore any temporary variable that is used in a dataType
-  * must use a unique name apeended to the end. This name must be passed in and it is up to the user of
-  * DataType to insure it is unique.
-  * @return Unique Name 
-  */
-  public void setUniqueName(String name);
-
-  /**
-  * This is the name each temp variable will use
-  * 
-  *
-  */
-  public String getUniqueName();
-  
-  /**
-  * This function dictates how you want to process the 
-  * incoming string from the input jsp. You may or may not use the markup 
-  * function depending on the type. The simple types use it. DomElement does not
-  * @param String the name of the attribute
-  * @return String the code to be generated
-  */
-  public String getRequestCode(String name, String id);
-
-
-  /**
-  * Input form returns the user input html
-  * @param String name The name of the input element
-  * @return String The form used to collect the data
-  */
-  public String inputForm(String name);
-  
-  /**
-  * converts the type returned from the proxy 
-  * back to a string 
-  * @return String convert the type to string.
-  */
-  public String TypeConversion(String name);
-
-  /**
-  * return the type
-  * @return String the type(including package).
-  */
-  public String getType();
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/DateType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/DateType.java
deleted file mode 100644
index 6a83989..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/DateType.java
+++ /dev/null
@@ -1,125 +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.consumption.datamodel.beanmodel;
-
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-
-
-/**
-* objects of this class represent a type
-* 
-*/
-public class DateType extends SimpleType 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  /**
-  *Constructor
-  *
-  */
-  public DateType()
-  {
-    super(TypeFactory.BIG_DECIMAL_NAME);
-  }
- 
-
-  /**
-  * inputForm returns the user input html
-  * The simple form is just a text input box
-  * This has been specialized to show an example
-  * @param String name The name of the input element
-  * @return String The form used to collect the data
-  */
-  public String inputForm(String name)
-  {
-     String inputForm = "<TD ALIGN=\"left\"><INPUT TYPE=\"TEXT\" NAME=\"" 
-                         + name + "\" SIZE=20></TD>" + StringUtils.NEWLINE 
-                         + "<%" + StringUtils.NEWLINE
-                         + "java.text.DateFormat dateFormat" + getUniqueName()+ " = java.text.DateFormat.getDateInstance();" + StringUtils.NEWLINE   
-                         + "java.util.GregorianCalendar gcExamp" + getUniqueName()+ "  = new java.util.GregorianCalendar();" + StringUtils.NEWLINE 
-                         + "java.util.Date date" + getUniqueName()+ " = gcExamp" + getUniqueName()+ ".getTime();" + StringUtils.NEWLINE                 
-                         + "String tempResult" + getUniqueName()+ " = dateFormat" + getUniqueName()+ ".format(date" + getUniqueName()+ ");" + StringUtils.NEWLINE  
-                         + "%>" + StringUtils.NEWLINE
-                         + "<TD ALIGN=\"left\">" + StringUtils.NEWLINE  
-                         + "</TR>" + StringUtils.NEWLINE
-                         + "<TR>"  + StringUtils.NEWLINE
-                         + "<TD> </TD>" + StringUtils.NEWLINE
-                         + "<TD ALIGN=\"left\"> eg. <%= tempResult" + getUniqueName()+ " %> </TD>" + StringUtils.NEWLINE
-                         + "</TR>" + StringUtils.NEWLINE;
-                       
-                         
-
-     return inputForm;
-  }
-
-
-  /*
-  * This function needs to be specialized
-  * We must use the date function to help
-  * us convert back and forth
-  */
-  public String stringConversion(String typeName, String nodeName, String attributeName)
-  {
-     String conversion =  Generator.DOUBLE_TAB + "java.text.DateFormat dateFormat" + getUniqueName()+ " = java.text.DateFormat.getDateInstance();"  
-                         + StringUtils.NEWLINE + Generator.DOUBLE_TAB +  "java.util.Date " + nodeName  +  "= dateFormat" + getUniqueName()+ ".parse(" + attributeName + ");"                         
-                         + "" + StringUtils.NEWLINE;
-     return conversion;
-  }
-
-  /**
-  * this is needed for most case 
-  * but it is peripheral as the stringconversion needed 
-  * to be overridden
-  */
-  public String StringToType(String name)
-  {
-    return "";
-  }
-
-
-
-  /**
-  * converts the type returned from the proxy 
-  * back to a string 
-  * @return String convert the type to string.
-  */
-  public String TypeConversion(String name)
-  {
-
-    String conversion = Generator.DOUBLE_TAB + "java.text.DateFormat dateFormat" + getUniqueName()+ " = java.text.DateFormat.getDateInstance();" + StringUtils.NEWLINE 
-    	               + Generator.DOUBLE_TAB + "String tempResult" + getUniqueName()+ " = org.eclipse.jst.ws.util.JspUtils.markup(dateFormat" + getUniqueName()+ ".format(" + name +"));" + StringUtils.NEWLINE 
-                       + Generator.DOUBLE_TAB + "%>" + StringUtils.NEWLINE
-                       + Generator.DOUBLE_TAB + "<%= tempResult" + getUniqueName()+ " %>" + StringUtils.NEWLINE
-                       + Generator.DOUBLE_TAB + "<%" + StringUtils.NEWLINE;
-
-    return conversion;
-  }
-
-
-
-  /**
-  * The stringConversion function nails out specific conversion methods used among simple types 
-  * This method is to be implemented by SimpleType subclasses
-  * @param String the name of string after the request call
-  * @return String the actual conversion string containing the name.
-  */
-  public String TypeToString(String name)
-  {
-    return "";
-  }
- 
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/DomElementType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/DomElementType.java
deleted file mode 100644
index c0406ac..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/DomElementType.java
+++ /dev/null
@@ -1,123 +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.consumption.datamodel.beanmodel;
-
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-
-
-/**
-* objects of this class represent a type
-* 
-*/
-public class DomElementType implements DataType
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  protected String fType;
-  protected String fUniqueName;
-
-  /**
-  *Constructor
-  *
-  */
-  public DomElementType()
-  {
-    fType = "org.w3c.dom.Element";
-    fUniqueName = "";
-  }
-
-  /**
-  * inputForm returns the user input html
-  * The DomElement form is a text box
-  * @param String name The name of the input element
-  * @return String The form used to collect the data
-  */
-  public String inputForm(String name)
-  {
-     String inputForm = "<TD ALIGN=\"left\"><TEXTAREA Rows=7 Cols=45 NAME=\"" 
-                         + name + "\"></TEXTAREA></TD>" + StringUtils.NEWLINE 
-                         + "</TR>" + StringUtils.NEWLINE;
-     return inputForm;
-  }
-
-   /**
-  * This function dictates how you want to process the 
-  * incoming string from the input jsp. You may or may not use the markup 
-  * function depending on the type. The simple types use it. DomElement does not
-  * @param String the name of the attribute
-  * @return String the code to be generated
-  */
-  public String getRequestCode(String name, String id)
-  {
-     String requestCode = Generator.DOUBLE_TAB + "String" + Generator.SPACE 
-     	                   + id + "=  request.getParameter(\""
-     	                   + name +"\");" + StringUtils.NEWLINE;
-     return requestCode;
-  }
-
-  /**
-  * This function hands back the code required to go from the 
-  * string the user entered to the actual type of the element
-  * @param String typeName this is the actual name of the type ie int,boolean
-  * @param String nodeName The nodeName is just the attributename + Temp. 
-  * @param String the attributeName 
-  * @return String convert the string to type .
-  */
-  public String stringConversion(String typeName, String nodeName, String attributeName)
-  {
-     String conversion =  Generator.DOUBLE_TAB 
-                       + "org.w3c.dom.Element " + nodeName + "= org.eclipse.jst.ws.util.DomElementHelper.createDomElementFromXMLString(" + attributeName + ");" 
-	                   + StringUtils.NEWLINE;
-     return conversion; 
-  }
-
-  /**
-  * This is basically the function that dictates how we want to display this type 
-  * upon receiving it as a return from a proxy method
-  * @param String the name of the type
-  * @return String The display string
-  */
-  public String TypeConversion(String name)
-  {
-    String typeToString = Generator.DOUBLE_TAB + "String tempResult" + getUniqueName()+ " = org.eclipse.jst.ws.util.DomElementHelper.domWriter(" + name + ", new java.lang.StringBuffer()" + ");" + StringUtils.NEWLINE 
-                       + Generator.DOUBLE_TAB + "%>" + StringUtils.NEWLINE
-                       + Generator.DOUBLE_TAB + "<%= tempResult" + getUniqueName()+ " %>" + StringUtils.NEWLINE
-                       + Generator.DOUBLE_TAB + "<%" + StringUtils.NEWLINE;
-
-    return typeToString;
-  }
-
-  /**
-  * return the name of this type
-  * @return String the name(including package).
-  */
-  public String getType()
-  {
-    return fType;
-  }
-
-  public String getUniqueName()
-  {
-    return fUniqueName;
-  }
-
-  public void setUniqueName(String name)
-  {
-    fUniqueName = name;
-  }
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/FieldElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/FieldElement.java
deleted file mode 100644
index b468fa9..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/FieldElement.java
+++ /dev/null
@@ -1,93 +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.consumption.datamodel.beanmodel;
-
-import java.util.Enumeration;
-
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-
-
-/**
-* Objects of this class represent a Java bean method parameter.
-* Nearest moral equivalents: java.beans.ParameterDescriptor.
-*/
-public class FieldElement extends BasicElement implements AttributeElementType
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  private String fSetterMethod;
-  private String fGetterMethod;
-
- 
-  public static final String REL_TYPE = "type";
-  public static final String REL_OWNING_BEAN = "owningbean";
-  
-  /**
-  * Constructor this takes the owning bean.
-  * @param name The name of the attribute.
-  * @param beanElement the bean that owns this attribute.
-  */
-  public FieldElement ( BeanElement beanElement, String name)
-  {
-    super(name,beanElement,REL_OWNING_BEAN,BeanElement.REL_FIELDS);
-    fSetterMethod = name;
-    fGetterMethod = name;
-  }
-
-  public void setSetterMethod(String setterMethod)
-  {
-    fSetterMethod = setterMethod;
-  }
-
-  public String getSetterMethod()
-  {
-    return fSetterMethod;
-  }
-
-  public String getGetterMethod()
-  {
-    return fGetterMethod;
-  }
- 
-  public void setGetterMethod(String getterMethod)
-  {
-    fGetterMethod = getterMethod;
-  }
-
-  public String getSetterSignature(String attribute)
-  {
-    return fSetterMethod + " = " + attribute + ";";
-  }
-   
-  /**
-  * Returns the Bean that owns this Attribute.
-  * @return BeanElement The bean that owns this attribute.
-  */
-  public BeanElement getOwningBeanElement ()
-  {
-    Enumeration e = getElements(REL_OWNING_BEAN);
-    return e.hasMoreElements() ? (BeanElement)e.nextElement() : null;
-  }
-
-  /**
-  * Returns the type that is owned by this attributte.
-  * @return TypeElement The Type that of this attribute.
-  */
-  public TypeElement getTypeElement ()
-  {
-    Enumeration e = getElements(REL_TYPE);
-    return e.hasMoreElements() ? (TypeElement)e.nextElement() : null;
-  }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/GregorianCalendarType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/GregorianCalendarType.java
deleted file mode 100644
index d7cfbf9..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/GregorianCalendarType.java
+++ /dev/null
@@ -1,127 +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.consumption.datamodel.beanmodel;
-
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-
-/**
-* objects of this class represent a type
-* 
-*/
-public class GregorianCalendarType extends SimpleType 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  /**
-  *Constructor
-  *
-  */
-  public GregorianCalendarType()
-  {
-    super(TypeFactory.GREGORIAN_CALENDAR_NAME);
-  }
-
-
-  /**
-  * inputForm returns the user input html
-  * The simple form is just a text input box
-  * This has been specialized to show an example
-  * @param String name The name of the input element
-  * @return String The form used to collect the data
-  */
-  public String inputForm(String name)
-  {
-     String inputForm = "<TD ALIGN=\"left\"><INPUT TYPE=\"TEXT\" NAME=\"" 
-                         + name + "\" SIZE=20></TD>" + StringUtils.NEWLINE 
-                         + "<%" + StringUtils.NEWLINE
-                         + "java.text.DateFormat dateFormat" + getUniqueName()+ " = java.text.DateFormat.getDateInstance();" + StringUtils.NEWLINE   
-                         + "java.util.GregorianCalendar gcExamp" + getUniqueName()+ "  = new java.util.GregorianCalendar();" + StringUtils.NEWLINE 
-                         + "java.util.Date date" + getUniqueName()+ " = gcExamp" + getUniqueName()+ ".getTime();" + StringUtils.NEWLINE                 
-                         + "String tempResult" + getUniqueName()+ " = dateFormat" + getUniqueName()+ ".format(date" + getUniqueName()+ ");" + StringUtils.NEWLINE  
-                         + "%>" + StringUtils.NEWLINE
-          
-                          
-                         + "<TD ALIGN=\"left\">" + StringUtils.NEWLINE  
-                         + "</TR>" + StringUtils.NEWLINE
-                         + "<TR>"  + StringUtils.NEWLINE
-                         + "<TD> </TD>" + StringUtils.NEWLINE
-                         + "<TD ALIGN=\"left\"> eg. <%= tempResult" + getUniqueName()+ " %> </TD>" + StringUtils.NEWLINE
-                         + "</TR>" + StringUtils.NEWLINE;
-                       
-                         
-
-     return inputForm;
-  }
- 
- 
-  /*
-  * This function needs to be specialized
-  * We must use the date function to help
-  * us convert back and forth
-  */
-   public String stringConversion(String typeName, String nodeName, String attributeName)
-  {
-     String conversion =  Generator.DOUBLE_TAB + "java.text.DateFormat dateFormat" + getUniqueName()+ " = java.text.DateFormat.getDateInstance();"  
-                         + StringUtils.NEWLINE + Generator.DOUBLE_TAB +  "java.util.Date dateTemp" + getUniqueName()+ "  = dateFormat" + getUniqueName()+ ".parse(" + attributeName + ");"                         
-                         + StringUtils.NEWLINE + Generator.DOUBLE_TAB + "java.util.GregorianCalendar" + Generator.SPACE + nodeName + " = " + "new java.util.GregorianCalendar();" 
-                         + StringUtils.NEWLINE + Generator.DOUBLE_TAB + nodeName + ".setTime(dateTemp" + getUniqueName()+ ");"
-                         + "" + StringUtils.NEWLINE;
-     return conversion;
-  }
-
-  /**
-  * this is needed for most case 
-  * but it is peripheral as the stringconversion needed 
-  * to be overridden
-  */
-  public String StringToType(String name)
-  {
-    return "";
-  }
-
-  /**
-  * converts the type returned from the proxy 
-  * back to a string 
-  * @return String convert the type to string.
-  */
-  public String TypeConversion(String name)
-  {
-
-    String conversion = Generator.DOUBLE_TAB + "java.text.DateFormat dateFormat" + getUniqueName()+ " = java.text.DateFormat.getDateInstance();" + StringUtils.NEWLINE 
-    	               + Generator.DOUBLE_TAB + "java.util.Date date" + getUniqueName()+ " = " + name + ".getTime();" + StringUtils.NEWLINE 
-    	               + Generator.DOUBLE_TAB + "String tempResult" + getUniqueName()+ " = org.eclipse.jst.ws.util.JspUtils.markup(dateFormat" + getUniqueName()+ ".format(date" + getUniqueName() + "));" + StringUtils.NEWLINE 
-                       + Generator.DOUBLE_TAB + "%>" + StringUtils.NEWLINE
-                       + Generator.DOUBLE_TAB + "<%= tempResult" + getUniqueName()+ " %>" + StringUtils.NEWLINE
-                       + Generator.DOUBLE_TAB + "<%" + StringUtils.NEWLINE;
-
-    return conversion;
-  }
-
-
-
-  /**
-  * The stringConversion function nails out specific conversion methods used among simple types 
-  * This method is to be implemented by SimpleType subclasses
-  * @param String the name of string after the request call
-  * @return String the actual conversion string containing the name.
-  */
-  public String TypeToString(String name)
-  {
-    return "";
-  }
- 
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/HashtableType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/HashtableType.java
deleted file mode 100644
index a1ff2cf..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/HashtableType.java
+++ /dev/null
@@ -1,37 +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.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a recognized return type
-* 
-*/
-public class HashtableType extends RecognizedReturnType
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  /**
-  *Constructor
-  *
-  */
-  public HashtableType()
-  {
-    super(TypeFactory.HASHTABLE_NAME);
-  }
-
-  
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/MapType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/MapType.java
deleted file mode 100644
index 0035bfb..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/MapType.java
+++ /dev/null
@@ -1,37 +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.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a recognized return type
-* 
-*/
-public class MapType extends RecognizedReturnType
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  /**
-  *Constructor
-  *
-  */
-  public MapType()
-  {
-    super(TypeFactory.MAP_NAME);
-  }
-
-  
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/MethodElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/MethodElement.java
deleted file mode 100644
index d2892ff..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/MethodElement.java
+++ /dev/null
@@ -1,130 +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.consumption.datamodel.beanmodel;
-
-import java.util.Enumeration;
-
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-
-
-/**
-* Objects of this class represent a Java bean method.
-* Nearest moral equivalents: java.lang.reflect.Method, java.beans.MethodDescriptor.
-*/
-public class MethodElement extends BasicElement
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  public static final String REL_BEAN = "bean";
-  public static final String REL_PARAMETERS = "parameters";
-  public static final String REL_RETURN_PARAMETERS = "returnparameters";
-  private String fDisplayName;
-  private String fName;
-  private boolean fMethodOmitted;
-
-  /**
-  * Constructor.
-  * @param bean The Bean that owns this method.
-  * @param name The name of the method.
-  * @param type The type of the method.
-  */
-  public MethodElement ( BeanElement beanElement, String name, String displayName)
-  {
-    super(name,beanElement,REL_BEAN,BeanElement.REL_METHODS);
-    fDisplayName = displayName;
-    fName = name;
-    fMethodOmitted = false;
-    
-  }
-
-  /*
-  * In the event that there is an unsupported type
-  * we will set the ommission boolean variable
-  * @return boolean true if this method is to be ommited
-  */
-  public boolean getMethodOmmission()
-  {
-    return fMethodOmitted;
-  }
-
-  /*
-  * In the event that there is an unsupported type
-  * we will get the ommission boolean variable
-  * @param boolean true if this method is to be ommited
-  */
-  public void setMethodOmmission(boolean bool)
-  {
-    fMethodOmitted = bool;
-  }
-
-
-  public String getName()
-  {
-    return fName;
-  }
-
-  public String getDisplayName()
-  {
-    return fDisplayName;
-  }
-
-  /**
-  * Returns the Bean that owns this method.
-  * @return Bean The Bean that owns this method.
-  */
-  public BeanElement getBeanElement ()
-  {
-    Enumeration e = getElements(REL_BEAN);
-    return e.hasMoreElements() ? (BeanElement)e.nextElement() : null;
-  }
-
-  /**
-  * Returns an enumeration of the return parameter of this method.
-  * @return Enumeration holds the return parameter of this method.
-  */
-  public Enumeration getReturnParameterEnum ()
-  {
-    return getElements(REL_RETURN_PARAMETERS);
-  }
-
-  /**
-  * Returns an enumeration of the return parameter of this method.
-  * @return Enumeration holds the return parameter of this method.
-  */
-  public ParameterElement getReturnParameterElement ()
-  {
-    Enumeration e = getReturnParameterEnum();
-    return e.hasMoreElements() ? (ParameterElement)e.nextElement() : null;
-  }
-
-  /**
-  * Returns an enumeration of all Parameter objects of this method.
-  * @return Enumeration All Parameter objects of this method.
-  */
-  public Enumeration getParameterElements ()
-  {
-    return getElements(REL_PARAMETERS);
-  }
-
-  /**
-  * Returns the number of Parameter objects of this method.
-  * @return int The number of Parameter objects of this method.
-  */
-  public int getNumberOfParameterElements ()
-  {
-    return getNumberOfElements(REL_PARAMETERS);
-  }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/ParameterElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/ParameterElement.java
deleted file mode 100644
index 02b0678..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/ParameterElement.java
+++ /dev/null
@@ -1,84 +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.consumption.datamodel.beanmodel;
-
-import java.util.Enumeration;
-
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-
-
-/**
-* Objects of this class represent a Java bean method parameter.
-* Nearest moral equivalents: java.beans.ParameterDescriptor.
-*/
-public class ParameterElement extends BasicElement
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- 
-  public static final String REL_METHOD = "method";
-  public static final String REL_TYPE = "type";
-
-  public boolean fReturnParameter=false;
-  
-  /**
-  * Constructor.
-  * @param method The Method that owns this parameter.
-  * @param name The name of the parameter.
-  * @param type The type of the parameter.
-  */
-  public ParameterElement ( MethodElement methodElement, String name, String relType,boolean returnParameter )
-  {
-    this(name,methodElement,REL_METHOD,relType);
-    fReturnParameter = returnParameter;
-  }
-  
-  /**
-  * Constructor.
-  * @param method The Method that owns this parameter.
-  * @param name The name of the parameter.
-  * @param type The type of the parameter.
-  */
-  public ParameterElement (String name, MethodElement methodElement, String outRel,String inRel)
-  {
-    super(name,methodElement,outRel,inRel);
-  }
-   
-  /**
-  * Returns the Method that owns this parameter.
-  * @return Method The Method that owns this parameter.
-  */
-  public MethodElement getMethodElement ()
-  {
-    Enumeration e = getElements(REL_METHOD);
-    return e.hasMoreElements() ? (MethodElement)e.nextElement() : null;
-  }
-
-  /**
-  * Returns the Method that owns this parameter.
-  * @return Method The Method that owns this parameter.
-  */
-  public TypeElement getTypeElement ()
-  {
-    Enumeration e = getElements(REL_TYPE);
-    return e.hasMoreElements() ? (TypeElement)e.nextElement() : null;
-  }
-
-  public boolean isReturn()
-  {
-    return fReturnParameter;
-  }
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveArrayType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveArrayType.java
deleted file mode 100644
index 3873061..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveArrayType.java
+++ /dev/null
@@ -1,65 +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.consumption.datamodel.beanmodel;
-
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-
-
-/**
-* objects of this class represent a recognized return type
-* 
-*/
-public class PrimitiveArrayType extends ArrayType
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  /**
-  *Constructor
-  *
-  */
-  public PrimitiveArrayType(String typeName)
-  {
-    super(TypeFactory.PRIMITIVE_ARRAY_NAME, typeName);
-  }
-
-   /**
-  * This is basically the function that dictates how we want to display this type 
-  * upon receiving it as a return from a proxy method
-  * @param String the name of the type
-  * @return String The display string
-  */
-  public String TypeConversion(String name)
-  {
-    String trippleTab = Generator.DOUBLE_TAB + Generator.TAB;
-
-    String nonBean = Generator.DOUBLE_TAB + "String temp" + getUniqueName() + " = \"[\";" 
-    	             + Generator.DOUBLE_TAB + "for(int i" + getUniqueName() + "=0;i" +getUniqueName() + "< " + name 
-    	                   + ".length;i" + getUniqueName() + "++){" + StringUtils.NEWLINE  
-    	             + trippleTab + "temp"+ getUniqueName() +" = temp"+getUniqueName() + " + " + name + "[i" + getUniqueName() 
-    	                   + "] + \",\";" + StringUtils.NEWLINE 
-                     + Generator.DOUBLE_TAB + "}" + StringUtils.NEWLINE
-                     + Generator.DOUBLE_TAB + "int length" + getUniqueName() + " = temp" + getUniqueName() + ".length();" 
-                           + StringUtils.NEWLINE
-                     + Generator.DOUBLE_TAB + "temp" + getUniqueName() + " = temp"+getUniqueName()+".substring(0,(length"+getUniqueName()+" - 1)) + \"]\";" 
-                           + StringUtils.NEWLINE
-    	             + Generator.DOUBLE_TAB + "%>" + StringUtils.NEWLINE  
-    	             + Generator.DOUBLE_TAB + "<%=temp"+ getUniqueName() +"%>" + StringUtils.NEWLINE
-                     + Generator.DOUBLE_TAB + "<%"+ StringUtils.NEWLINE;
-
-    return nonBean;
-  }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveBooleanType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveBooleanType.java
deleted file mode 100644
index f58ad9d..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveBooleanType.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 Eclipse Public License v1.0
- * which accompanies 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.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a type
-* 
-*/
-public class PrimitiveBooleanType extends PrimitiveType 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  /**
-  *Constructor
-  *
-  */
-  public PrimitiveBooleanType()
-  {
-    super(TypeFactory.PRIM_BOOLEAN_NAME);
-  }
- 
-  /**
-  * StringToType gets the string taken by the 
-  * user into proxy form
-  * @return String convert the string to type.
-  */
-  public String StringToType(String name)
-  {
-    String conversion = "Boolean.valueOf(" + name + ").booleanValue();";
-    return conversion;
-  }
-  
-  
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveByteType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveByteType.java
deleted file mode 100644
index 5045d26..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveByteType.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 Eclipse Public License v1.0
- * which accompanies 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.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a type
-* 
-*/
-public class PrimitiveByteType extends PrimitiveType 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  /**
-  *Constructor
-  *
-  */
-  public PrimitiveByteType()
-  {
-    super(TypeFactory.PRIM_BYTE_NAME);
-  }
- 
-  /**
-  * StringToType gets the string taken by the 
-  * user into proxy form
-  * @return String convert the string to type.
-  */
-  public String StringToType(String name)
-  {
-    String conversion = "Byte.parseByte(" + name + ");";
-    return conversion;
-  }
-  
-  
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveCharType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveCharType.java
deleted file mode 100644
index d52f903..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveCharType.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 Eclipse Public License v1.0
- * which accompanies 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.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a type
-* 
-*/
-public class PrimitiveCharType extends PrimitiveType 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  /**
-  *Constructor
-  *
-  */
-  public PrimitiveCharType()
-  {
-    super(TypeFactory.PRIM_CHAR_NAME);
-  }
- 
-  /**
-  * StringToType gets the string taken by the 
-  * user into proxy form
-  * @return String convert the string to type.
-  */
-  public String StringToType(String name)
-  {
-    String conversion = "" + name + ".charAt(0);";
-    return conversion;
-  }
-  
-  
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveDoubleType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveDoubleType.java
deleted file mode 100644
index 7b362e7..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveDoubleType.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 Eclipse Public License v1.0
- * which accompanies 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.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a type
-* 
-*/
-public class PrimitiveDoubleType extends PrimitiveType 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  /**
-  *Constructor
-  *
-  */
-  public PrimitiveDoubleType()
-  {
-    super(TypeFactory.PRIM_DOUBLE_NAME);
-  }
- 
-  /**
-  * StringToType gets the string taken by the 
-  * user into proxy form
-  * @return String convert the string to type.
-  */
-  public String StringToType(String name)
-  {
-    String conversion = "Double.parseDouble(" + name + ");";
-    return conversion;
-  }
-  
-  
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveFloatType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveFloatType.java
deleted file mode 100644
index 200f9d7..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveFloatType.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 Eclipse Public License v1.0
- * which accompanies 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.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a type
-* 
-*/
-public class PrimitiveFloatType extends PrimitiveType 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  /**
-  *Constructor
-  *
-  */
-  public PrimitiveFloatType()
-  {
-    super(TypeFactory.PRIM_FLOAT_NAME);
-  }
- 
-  /**
-  * StringToType gets the string taken by the 
-  * user into proxy form
-  * @return String convert the string to type.
-  */
-  public String StringToType(String name)
-  {
-    String conversion = "Float.parseFloat(" + name + ");";
-    return conversion;
-  }
-  
-  
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveIntType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveIntType.java
deleted file mode 100644
index 2f33dd9..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveIntType.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 Eclipse Public License v1.0
- * which accompanies 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.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a type
-* 
-*/
-public class PrimitiveIntType extends PrimitiveType 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  /**
-  *Constructor
-  *
-  */
-  public PrimitiveIntType()
-  {
-    super(TypeFactory.PRIM_INTEGER_NAME);
-  }
- 
-  /**
-  * StringToType gets the string taken by the 
-  * user into proxy form
-  * @return String convert the string to type.
-  */
-  public String StringToType(String name)
-  {
-    String conversion = "Integer.parseInt(" + name + ");";
-    return conversion;
-  }
-  
-  
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveJavaTypes.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveJavaTypes.java
deleted file mode 100644
index f715236..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveJavaTypes.java
+++ /dev/null
@@ -1,56 +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.consumption.datamodel.beanmodel;
-
-/**
-* objects of this class represent a type
-* 
-*/
-public class PrimitiveJavaTypes extends SimpleType 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  /**
-  *Constructor
-  *
-  */
-  public PrimitiveJavaTypes(String type)
-  {
-    super(type);
-  }
- 
-  /**
-  * StringToType gets the string taken by the 
-  * user into proxy form
-  * @return String convert the string to type .
-  */
-  public String StringToType(String name)
-  {
-    String conversion = fType + ".valueOf(" + name + ");";
-    return conversion;    
-  }
-
-  /**
-  * The stringConversion function nails out specific conversion methods used among simple types 
-  * This method is to be implemented by SimpleType subclasses
-  * @param String the name of string after the request call
-  * @return String the actual conversion string containing the name.
-  */
-  public String TypeToString(String name)
-  {
-    return "String.valueOf(" + name + ")";
-  }
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveLongType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveLongType.java
deleted file mode 100644
index ef0c826..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveLongType.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 Eclipse Public License v1.0
- * which accompanies 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.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a type
-* 
-*/
-public class PrimitiveLongType extends PrimitiveType 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  /**
-  *Constructor
-  *
-  */
-  public PrimitiveLongType()
-  {
-    super(TypeFactory.PRIM_LONG_NAME);
-  }
- 
-  /**
-  * StringToType gets the string taken by the 
-  * user into proxy form
-  * @return String convert the string to type.
-  */
-  public String StringToType(String name)
-  {
-    String conversion = "Long.parseLong(" + name + ");";
-    return conversion;
-  }
-  
-  
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveShortType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveShortType.java
deleted file mode 100644
index 8f91ce6..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveShortType.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 Eclipse Public License v1.0
- * which accompanies 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.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a type
-* 
-*/
-public class PrimitiveShortType extends PrimitiveType 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  /**
-  *Constructor
-  *
-  */
-  public PrimitiveShortType()
-  {
-    super(TypeFactory.PRIM_SHORT_NAME);
-  }
- 
-  /**
-  * StringToType gets the string taken by the 
-  * user into proxy form
-  * @return String convert the string to type.
-  */
-  public String StringToType(String name)
-  {
-    String conversion = "Short.parseShort(" + name + ");";
-    return conversion;
-  }
-  
-  
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveType.java
deleted file mode 100644
index 4b51767..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveType.java
+++ /dev/null
@@ -1,47 +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.consumption.datamodel.beanmodel;
-
-/**
-* objects of this class represent a type
-* 
-*/
-public abstract class PrimitiveType extends SimpleType 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  /**
-  *Constructor
-  *
-  */
-  public PrimitiveType(String type)
-  {
-    super(type);
-  }
- 
- /**
-  * The stringConversion function nails out specific conversion methods used among simple types 
-  * This method is to be implemented by SimpleType subclasses
-  * @param String the name of string after the request call
-  * @return String the actual conversion string containing the name.
-  */
-  public String TypeToString(String name)
-  {
-    return "String.valueOf(" + name + ")";
-  }
-  
-  
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/RecognizedReturnType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/RecognizedReturnType.java
deleted file mode 100644
index fc721a8..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/RecognizedReturnType.java
+++ /dev/null
@@ -1,108 +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.consumption.datamodel.beanmodel;
-
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-
-
-/**
-* objects of this class represent a recognized return type
-* 
-*/
-public class RecognizedReturnType implements DataType
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  protected String fType;
-  protected String fUniqueName;
-
-  /**
-  *Constructor
-  *
-  */
-  public RecognizedReturnType(String type)
-  {
-    fType = type;
-    fUniqueName = "";
-  }
-
-  /**
-  * not relevant at this point 
-  */
-  public String inputForm(String name)
-  {
-     return "";
-  }
-
-   /**
-  * again not relevant
-  */
-  public String getRequestCode(String name, String id)
-  {
-     return "";
-  }
-
-  /**
-  * This function hands back the code required to go from the 
-  * string the user entered to the actual type of the element
-  * @param String typeName this is the actual name of the type ie int,boolean
-  * @param String nodeName The nodeName is just the attributename + Temp. 
-  * @param String the attributeName 
-  * @return String convert the string to type .
-  */
-  public String stringConversion(String typeName, String nodeName, String attributeName)
-  {
-    return "";
-  }
-
-  /**
-  * This is basically the function that dictates how we want to display this type 
-  * upon receiving it as a return from a proxy method
-  * @param String the name of the type
-  * @return String The display string
-  */
-  public String TypeConversion(String name)
-  {
-    String nonBean =   Generator.DOUBLE_TAB + "if(" + name + "!= null){" + StringUtils.NEWLINE   
-    	             + Generator.DOUBLE_TAB + "String temp" + getUniqueName()+" = " + name + ".toString();" + StringUtils.NEWLINE 
-                     + Generator.DOUBLE_TAB + "%>" + StringUtils.NEWLINE  
-    	             + Generator.DOUBLE_TAB +  "<%=temp" + getUniqueName() +"%>" + StringUtils.NEWLINE
-                     + Generator.DOUBLE_TAB +  "<%" + StringUtils.NEWLINE
-                     + Generator.DOUBLE_TAB + "}";
-    return nonBean;
-  }
-
-  /**
-  * return the name of this type
-  * @return String the name(including package).
-  */
-  public String getType()
-  {
-    return fType;
-  }
-
-  public String getUniqueName()
-  {
-    return fUniqueName;
-  }
-
-  public void setUniqueName(String name)
-  {
-    fUniqueName = name;
-  }
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/SOAPElementType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/SOAPElementType.java
deleted file mode 100644
index 289e009..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/SOAPElementType.java
+++ /dev/null
@@ -1,123 +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.consumption.datamodel.beanmodel;
-
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-
-
-/**
-* objects of this class represent a type
-* 
-*/
-public class SOAPElementType implements DataType
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  protected String fType;
-  protected String fUniqueName;
-
-  /**
-  *Constructor
-  *
-  */
-  public SOAPElementType()
-  {
-    fType = "javax.xml.soap.SOAPElement";
-    fUniqueName = "";
-  }
-
-  /**
-  * inputForm returns the user input html
-  * The DomElement form is a text box
-  * @param String name The name of the input element
-  * @return String The form used to collect the data
-  */
-  public String inputForm(String name)
-  {
-     String inputForm = "<TD ALIGN=\"left\"><TEXTAREA Rows=7 Cols=45 NAME=\"" 
-                         + name + "\"></TEXTAREA></TD>" + StringUtils.NEWLINE 
-                         + "</TR>" + StringUtils.NEWLINE;
-     return inputForm;
-  }
-
-   /**
-  * This function dictates how you want to process the 
-  * incoming string from the input jsp. You may or may not use the markup 
-  * function depending on the type. The simple types use it. DomElement does not
-  * @param String the name of the attribute
-  * @return String the code to be generated
-  */
-  public String getRequestCode(String name, String id)
-  {
-     String requestCode = Generator.DOUBLE_TAB + "String" + Generator.SPACE 
-     	                   + id + "=  request.getParameter(\""
-     	                   + name +"\");" + StringUtils.NEWLINE;
-     return requestCode;
-  }
-
-  /**
-  * This function hands back the code required to go from the 
-  * string the user entered to the actual type of the element
-  * @param String typeName this is the actual name of the type ie int,boolean
-  * @param String nodeName The nodeName is just the attributename + Temp. 
-  * @param String the attributeName 
-  * @return String convert the string to type .
-  */
-  public String stringConversion(String typeName, String nodeName, String attributeName)
-  {
-     String conversion =  Generator.DOUBLE_TAB 
-                       + "javax.xml.soap.SOAPElement " + nodeName + "= org.eclipse.jst.ws.util.SoapElementHelper.createSOAPElementFromXMLString(" + attributeName + ");" 
-	                   + StringUtils.NEWLINE;
-     return conversion;
-  }
-
-  /**
-  * This is basically the function that dictates how we want to display this type 
-  * upon receiving it as a return from a proxy method
-  * @param String the name of the type
-  * @return String The display string
-  */
-  public String TypeConversion(String name)
-  {
-    String typeToString = Generator.DOUBLE_TAB + "String tempResult" + getUniqueName()+ " = org.eclipse.jst.ws.util.SoapElementHelper.soapElementWriter(" + name + ", new java.lang.StringBuffer()" + ");" + StringUtils.NEWLINE 
-                       + Generator.DOUBLE_TAB + "%>" + StringUtils.NEWLINE
-                       + Generator.DOUBLE_TAB + "<%= tempResult" + getUniqueName()+ " %>" + StringUtils.NEWLINE
-                       + Generator.DOUBLE_TAB + "<%" + StringUtils.NEWLINE;
-
-    return typeToString;
-  }
-
-  /**
-  * return the name of this type
-  * @return String the name(including package).
-  */
-  public String getType()
-  {
-    return fType;
-  }
-
-  public String getUniqueName()
-  {
-    return fUniqueName;
-  }
-
-  public void setUniqueName(String name)
-  {
-    fUniqueName = name;
-  }
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/SimpleElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/SimpleElement.java
deleted file mode 100644
index f478345..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/SimpleElement.java
+++ /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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-
-/**
-* 1 of three type elements represents primitives 
-*/
-public class SimpleElement extends TypeElement
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  /**
-  * Constructor 
-  * @param ParameterElement The Parameter that owns this simple type.
-  * @param String Name of the simple element.
-  */
-  public SimpleElement ( ParameterElement parameterElement, String name, boolean prim)
-  {
-    super(name,parameterElement,TypeElement.REL_OWNER,TypeElement.REL_TYPE,TypeElement.SIMPLE);
-    fOwnerType = TypeElement.PARAMETER_OWNER;
-    setPrimitive(prim);
-  }
-  
-  /**
-  * Constructor 
-  * @param ParameterElement The Attribute that owns this simple type.
-  * @param String Name of the AttributeElement.
-  */
-  public SimpleElement ( AttributeElement attributeElement, String name, boolean prim)
-  {
-    super(name,attributeElement,TypeElement.REL_OWNER,TypeElement.REL_TYPE,TypeElement.SIMPLE);
-    fOwnerType = TypeElement.ATTRIBUTE_OWNER;
-    setPrimitive(prim);
-  }
-
-  /**
-  * Constructor 
-  * @param ParameterElement The Attribute that owns this simple type.
-  * @param String Name of the AttributeElement.
-  */
-  public SimpleElement ( FieldElement fieldElement, String name, boolean prim)
-  {
-    super(name,fieldElement,TypeElement.REL_OWNER,TypeElement.REL_TYPE,TypeElement.SIMPLE);
-    fOwnerType = TypeElement.FIELD_OWNER;
-    setPrimitive(prim);
-  }
-  
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/SimpleType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/SimpleType.java
deleted file mode 100644
index e819482..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/SimpleType.java
+++ /dev/null
@@ -1,140 +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.consumption.datamodel.beanmodel;
-
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-
-
-/**
-* objects of this class represent a type
-* 
-*/
-public abstract class SimpleType implements DataType
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  protected String fType;
-  protected String fUniqueName;
-
-  /**
-  *Constructor
-  *
-  */
-  public SimpleType(String type)
-  {
-    fType = type;
-  }
-
-  /**
-  * inputForm returns the user input html
-  * The simple form is just a text input box
-  * @param String name The name of the input element
-  * @return String The form used to collect the data
-  */
-  public String inputForm(String name)
-  {
-     String inputForm = "<TD ALIGN=\"left\"><INPUT TYPE=\"TEXT\" NAME=\"" 
-                         + name + "\" SIZE=20></TD>" + StringUtils.NEWLINE 
-                         + "</TR>" + StringUtils.NEWLINE;
-     return inputForm;
-  }
-
-   /**
-  * This function dictates how you want to process the 
-  * incoming string from the input jsp. You may or may not use the markup 
-  * function depending on the type. The simple types use it. DomElement does not
-  * @param String the name of the attribute
-  * @return String the code to be generated
-  */
-  public String getRequestCode(String name, String id)
-  {
-     String requestCode = Generator.DOUBLE_TAB + "String" + Generator.SPACE 
-     	                   + id + "=  request.getParameter(\""
-     	                   + name +"\");" + StringUtils.NEWLINE;
-     return requestCode;
-   }
- 
-  /**
-  * This function hands back the code required to go from the 
-  * string the user entered to the actual type of the element
-  * it uses another function that all subclasses of SimpleType are required to implement
-  * The StringToType function
-  * @param String typeName this is the actual name of the type ie int,boolean
-  * @param String nodeName The nodeName is just the attributename + Temp. 
-  * @param String the attributeName 
-  * @return String convert the string to type .
-  */
-  public String stringConversion(String typeName, String nodeName, String attributeName)
-  {
-     String conversion = Generator.DOUBLE_TAB + typeName + Generator.SPACE + nodeName 
-     	                 + Generator.SPACE + " = " + StringToType(attributeName) 
-     	                 + "" + StringUtils.NEWLINE;
-     return conversion;
-  }
-
-  /**
-  * The stringConversion function nails out specific conversion methods used among simple types 
-  * This method is to be implemented by SimpleType subclasses
-  * @param String the name of string after the request call
-  * @return String the actual conversion string containing the name.
-  */
-  public abstract String StringToType(String name);
-
-  /**
-  * converts the type returned from the proxy 
-  * back to a string 
-  * @return String convert the type to string.
-  */
-  public String TypeConversion(String name)
-  {
-
-    String conversion = Generator.DOUBLE_TAB + "String tempResult" + getUniqueName()+ " = org.eclipse.jst.ws.util.JspUtils.markup(" + TypeToString(name) + ");" + StringUtils.NEWLINE 
-                       + Generator.DOUBLE_TAB + "%>" + StringUtils.NEWLINE
-                       + Generator.DOUBLE_TAB + "<%= tempResult" + getUniqueName()+ " %>" + StringUtils.NEWLINE
-                       + Generator.DOUBLE_TAB + "<%" + StringUtils.NEWLINE;
-
-    return conversion;
-  }
-
-   /**
-  * The stringConversion function nails out specific conversion methods used among simple types 
-  * This method is to be implemented by SimpleType subclasses
-  * @param String the name of string after the request call
-  * @return String the actual conversion string containing the name.
-  */
-  public abstract String TypeToString(String name);
-
-  /**
-  * return the name of this type
-  * @return String the name(including package).
-  */
-  public String getType()
-  {
-    return fType;
-  }
-
-   public String getUniqueName()
-  {
-    return fUniqueName;
-  }
-
-  public void setUniqueName(String name)
-  {
-    fUniqueName = name;
-  }
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/StateLessBeanType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/StateLessBeanType.java
deleted file mode 100644
index 16a98a8..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/StateLessBeanType.java
+++ /dev/null
@@ -1,45 +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.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a recognized return type
-* 
-*/
-public class StateLessBeanType extends RecognizedReturnType
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-
-  private String fTypeName;
-
-
-
-  /**
-  *Constructor
-  *
-  */
-  
-  public StateLessBeanType(String name)
-  {
-    super(TypeFactory.STATELESS_BEAN);
-    fTypeName = name;
-
-  }
-
-  
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/StringType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/StringType.java
deleted file mode 100644
index 1b99c74..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/StringType.java
+++ /dev/null
@@ -1,57 +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.consumption.datamodel.beanmodel;
-
-/**
-* objects of this class represent a type
-* 
-*/
-public class StringType extends SimpleType 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  /**
-  *Constructor
-  *
-  */
-  public StringType()
-  {
-    super(TypeFactory.STRING_NAME);
-  }
- 
-  /**
-  * StringToType gets the string taken by the 
-  * user into proxy form
-  * @return String convert the string to type .
-  */
-  public String StringToType(String name)
-  {
-    String conversion = name + ";";
-    return conversion;    
-  }
-
-  /**
-  * The stringConversion function nails out specific conversion methods used among simple types 
-  * This method is to be implemented by SimpleType subclasses
-  * @param String the name of string after the request call
-  * @return String the actual conversion string containing the name.
-  */
-  public String TypeToString(String name)
-  {
-    return "String.valueOf(" + name + ")";
-  }
- 
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/TypeElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/TypeElement.java
deleted file mode 100644
index a8f22cd..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/TypeElement.java
+++ /dev/null
@@ -1,193 +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.consumption.datamodel.beanmodel;
-
-import java.util.Enumeration;
-
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-
-/**
-* TypeElement is the base class for Java bean features that have types.
-*/
-public abstract class TypeElement extends BasicElement
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
-  public static int BEAN = 0;
-  public static int SIMPLE = 1;
-  public static int ARRAY = 2;
-
-  private int fType;
-  protected int fOwnerType;
-  private boolean fPrimitive = false;
-
-  /**
-  * Constructor. Automatically adds this object to the given model.
-  * @param name The name of the element
-  * @param model The model to own this object.
-  * @param type The type represented by this object, one of
-  * <code>BEAN</code>, <code>SIMPLE</code> or <code>ARRAY</code>.
-  */
-  protected TypeElement ( String name, Model model, int type )
-  {
-    super(name,model);
-    fType = type;
-  }
-
-  /**
-  */
-  protected TypeElement ( String name, Element element, String outboundRelName, String inboundRelName, int type )
-  {
-    super(name,element,outboundRelName,inboundRelName);
-    fType = type;
-  }
-
-  /*
-  *This will tell you wether the type is a bean
-  *@param Boolean returns true if this is bean
-  **/
-  public boolean isBean()
-  {
-    if (fType == BEAN) return true;
-    return false;
-  }
-
-  /*
-  *This will tell you wether the type is a bean
-  *@param Boolean returns true if this is bean
-  **/
-  public boolean isPrimitive()
-  {
-    return fPrimitive;
-  }
-
-  /*
-  *This will tell you wether the type is a bean
-  *@param Boolean returns true if this is bean
-  **/
-  protected void setPrimitive(boolean prim)
-  {
-    fPrimitive = prim; 
-  }
-
-
-  /*
-  * This is mainly needed for arrays as with all types the
-  * names come out as java.util.type, but with an array it 
-  * isnt explicit in telling us its an array
-  */
-  public String getTypeName()
-  {
-    return getName();
-  }
-  
-  /*
-  *This will tell you wether the type is a simple
-  *@param Boolean returns true if this is simple
-  **/
-  public boolean isSimple()
-  {
-    if (fType == SIMPLE) return true;
-    return false;
-  }
-
-  /*
-  *This will tell you wether the type is a array
-  *@param Boolean returns true if this is array
-  **/
-  public boolean isArray()
-  {
-    if (fType == ARRAY) return true;
-    return false;
-  }
-
-  public static String REL_ATTRIBUTES = "attributes";
-  public static String REL_FIELDS = "fields";
-  public static final String REL_TYPE = "type";
-  public static final String REL_OWNER = "owner";
-
-  public static int PARAMETER_OWNER = 0;
-  public static int ATTRIBUTE_OWNER = 1;
-  public static int FIELD_OWNER = 2;
-  public static int ROOT = 3;
-
-  /*
-  * This could be The root test bean
-  * @return boolean true if this is root bean
-  */
-  public boolean isRoot()
-  {
-    if(fOwnerType == ROOT) return true;
-    return false;
-  }
-
-  /*
-  * This Type could be owned by a Parameter or an attribute
-  * @return boolean true if this is owned by a parameter
-  */
-  public boolean isOwnerParameter()
-  {
-    if(fOwnerType == PARAMETER_OWNER) return true;
-    return false;
-  }
-
-  /*
-  * This Type could be owned by a Parameter or an attribute
-  * @return boolean true if this is owned by an attribute 
-  */
-  public boolean isOwnerAttribute()
-  {
-    if(fOwnerType == ATTRIBUTE_OWNER) return true;
-    return false;
-  }
-
-  /*
-  * This Type could be owned by a Parameter or an attribute
-  * @return boolean true if this is owned by an attribute 
-  */
-  public boolean isOwnerField()
-  {
-    if(fOwnerType == FIELD_OWNER) return true;
-    return false;
-  }
-
-  /**
-  * This Type may be owned by a parameter or an attribute 
-  * Use this method in conjunction with isOwnerParamter, isOwner
-  * @return BasicElement the element that owns this attribute.
-  */
-  public BasicElement getOwningElement ()
-  {
-    if (isOwnerParameter()){
-      Enumeration e = getElements(REL_OWNER);
-      return e.hasMoreElements() ? (BasicElement)e.nextElement() : null;
-    }
-    else if(isOwnerAttribute()){
-      Enumeration e = getElements(REL_OWNER);
-      return e.hasMoreElements() ? (BasicElement)e.nextElement() : null;
-    }
-    else if(isOwnerField()){
-      Enumeration e = getElements(REL_OWNER);
-      return e.hasMoreElements() ? (BasicElement)e.nextElement() : null;
-    }
-
-    return null;
-  }
-
-  
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/TypeFactory.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/TypeFactory.java
deleted file mode 100644
index 4f9822a..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/TypeFactory.java
+++ /dev/null
@@ -1,249 +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.consumption.datamodel.beanmodel;
-
-import java.util.Hashtable;
-
-import org.eclipse.jem.java.JavaHelpers;
-/**
- * TypeFactory
- * Creation date: (4/10/2001 12:41:48 PM)
- * @author: Gilbert Andrews
- */
-public class TypeFactory 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
-  public static final String URL_NAME                   = "java.net.URL";
-  public static final String STRING_NAME               = "java.lang.String";
-  public static final String BIG_DECIMAL_NAME          = "java.math.BigDecimal";
-  public static final String BIG_INTEGER_NAME          = "java.math.BigInteger";
-  public static final String DATE_NAME                 = "java.util.Date";
-  public static final String GREGORIAN_CALENDAR_NAME = "java.util.GregorianCalendar";
-  public static final String CALENDAR_NAME             = "java.util.Calendar";
-  public static final String BOOLEAN_NAME              = "java.lang.Boolean";
-  public static final String BYTE_NAME                  = "java.lang.Byte";
-  public static final String DOUBLE_NAME               = "java.lang.Double";
-  public static final String FLOAT_NAME                 = "java.lang.Float";
-  public static final String INTEGER_NAME               = "java.lang.Integer";
-  public static final String LONG_NAME                  = "java.lang.Long";
-  public static final String SHORT_NAME                 = "java.lang.Short";
-  public static final String CHARACTER_NAME            = "java.lang.Character";
-  public static final String PRIM_BOOLEAN_NAME         = "boolean";
-  public static final String PRIM_BYTE_NAME            = "byte";
-  public static final String PRIM_DOUBLE_NAME          = "double";
-  public static final String PRIM_FLOAT_NAME           = "float";
-  public static final String PRIM_INTEGER_NAME         = "int";
-  public static final String PRIM_LONG_NAME            = "long";
-  public static final String PRIM_SHORT_NAME           = "short";
-  public static final String PRIM_CHAR_NAME            = "char";
-  public static final String VOID_NAME                  = "void";
-
-  //some special complex
-  public static final String DOM_ELEMENT_NAME   = "org.w3c.dom.Element";
-  public static final String SOAP_ELEMENT_NAME = "javax.xml.soap.SOAPElement";
-  public static final String STATELESS_BEAN = BeanElement.STATELESS_BEAN;
-
-
-
-  public static Hashtable javaTypes = new Hashtable();
-  
-  public TypeFactory(){}
-
-  static{
-    javaTypes.put(BOOLEAN_NAME,new PrimitiveJavaTypes(BOOLEAN_NAME));
-    javaTypes.put(BYTE_NAME,   new PrimitiveJavaTypes(BYTE_NAME));
-    javaTypes.put(DOUBLE_NAME, new PrimitiveJavaTypes(DOUBLE_NAME));
-    javaTypes.put(FLOAT_NAME,  new PrimitiveJavaTypes(FLOAT_NAME));
-    javaTypes.put(INTEGER_NAME,new PrimitiveJavaTypes(INTEGER_NAME));
-    javaTypes.put(LONG_NAME,   new PrimitiveJavaTypes(LONG_NAME));
-    javaTypes.put(SHORT_NAME,  new PrimitiveJavaTypes(SHORT_NAME));
-    javaTypes.put(CHARACTER_NAME,  new PrimitiveJavaTypes(CHARACTER_NAME));
-  }
-
-
-  /*
-  * This function allows us to handle recognized beans 
-  * in displaying and generating code for them instead of 
-  * treating them as complex types
-  */ 
-  public static boolean recognizedBean(String type)
-  {
-
-    //     
-    //current recognized beans (mostly java.lang)
-    if (type.equals(BOOLEAN_NAME)             ||
-        type.equals(BYTE_NAME)               ||
-        type.equals(DOUBLE_NAME)             ||
-        type.equals(FLOAT_NAME)               ||
-        type.equals(INTEGER_NAME)             ||
-        type.equals(LONG_NAME)               ||
-        type.equals(SHORT_NAME)              ||      
-        type.equals(CHARACTER_NAME)          ||      
-        type.equals(DOM_ELEMENT_NAME)        ||      
-	    type.equals(SOAP_ELEMENT_NAME)        ||
-        type.equals(BIG_DECIMAL_NAME)         ||
-        type.equals(BIG_INTEGER_NAME)         ||
-        type.equals(DATE_NAME)                ||
-        type.equals(GREGORIAN_CALENDAR_NAME) ||
-        type.equals(CALENDAR_NAME)           || 
-        type.equals(URL_NAME)                 ||    
-        type.equals(STRING_NAME))  return true;      
-     return false; 
-  
-  }
-
-  /*
-  * This function allows us to handle unsupported types 
-  * if we dont want to support a type and we want to omitt this  
-  * method from the samples
-  * @param javaHelpers this is the type to be evaluated
-  * @return boolean true if the type is not supported
-  */ 
-  public static boolean isUnSupportedType(JavaHelpers javaHelpers)
-  {
-    //we also dont support arrays
-    if (javaHelpers.isArray()||
-    		javaHelpers.getJavaName().equals(MAP_NAME)||
-    		javaHelpers.getJavaName().equals(VECTOR_NAME)||
-    		javaHelpers.getJavaName().equals("java.lang.class")	) return true;
-    
-    return false;
-  }
-
-  public static String HASHTABLE_NAME = "java.util.Hashtable";
-  public static String MAP_NAME = "java.util.Map";
-  public static String VECTOR_NAME = "java.util.Vector";
-  public static String ARRAY_NAME = ArrayElement.ARRAY_NAME;
-  public static String PRIMITIVE_ARRAY_NAME = "primitivearray";
-
-  public static boolean isRecognizedReturnType(JavaHelpers javaHelpers)
-  {
-    //arrays 
-    //Hashtable
-    //Vectors
-    if (javaHelpers.isArray()) return true;
-    else if (javaHelpers.getJavaName().equals(HASHTABLE_NAME))return true;
-    else if (javaHelpers.getJavaName().equals(VECTOR_NAME))return true;
-    else if (javaHelpers.getJavaName().equals(MAP_NAME))return true;
-    else return false;
-  }
-
-  public static boolean isRecognizedReturnType(String type)
-  {
-    //arrays 
-    //Hashtable
-    //Vectors
-    if (type.startsWith(ARRAY_NAME)) return true;
-    else if (type.equals(HASHTABLE_NAME))return true;
-    else if (type.equals(VECTOR_NAME))return true;
-    else if (type.equals(MAP_NAME))return true;
-    else return false;
-  }
-
-  public static boolean isStateLessBean(String type)
-  {
-    if(type.startsWith(STATELESS_BEAN)) return true;
-    return false;
-  }
-
-
-  /**
-  * Creates a type based on the JavaHelper then sets this type in the element
-  * @params JavaHelpers this holds the type
-  * @param TypeElement The element which will hold the type created
-  * @param String Uniquename to be used when naming temp variables
-  */
- 
-  public static DataType createType(String type, String UniqueName)
-  {
-    //this guy might be both stateless and one of the below elements
-    //we would like to be as specific as we can, stateless is the worst case 
-    boolean stateless = false;  
-    if(type.startsWith(STATELESS_BEAN)) {
-      stateless = true;
-      type = type.substring(29); 
-    }
-   
-    DataType datatype = null;
-    if      (type.equals(PRIM_BOOLEAN_NAME)) datatype = new PrimitiveBooleanType();
-    else if (type.equals(PRIM_BYTE_NAME))     datatype = new PrimitiveByteType();
-    else if (type.equals(PRIM_DOUBLE_NAME))  datatype = new PrimitiveDoubleType();
-    else if (type.equals(PRIM_FLOAT_NAME))   datatype = new PrimitiveFloatType();
-    else if (type.equals(PRIM_LONG_NAME))    datatype = new PrimitiveLongType();
-    else if (type.equals(PRIM_INTEGER_NAME)) datatype = new PrimitiveIntType();
-    else if (type.equals(PRIM_CHAR_NAME))    datatype = new PrimitiveCharType();
-    else if (type.equals(PRIM_SHORT_NAME))   datatype = new PrimitiveShortType();
-    
-
-    //see if this critter is a javatype
-    else if (type.equals(BOOLEAN_NAME)     ||
-            type.equals(BYTE_NAME)        ||
-            type.equals(DOUBLE_NAME)      ||
-            type.equals(FLOAT_NAME)       ||
-            type.equals(INTEGER_NAME)     ||
-            type.equals(LONG_NAME)        ||
-            type.equals(CHARACTER_NAME)  ||
-            type.equals(SHORT_NAME))        datatype = (DataType)javaTypes.get(type);   
-
-    //see if its a case we handle
-    else if (type.equals(STRING_NAME))               datatype = new StringType(); 
-    else if (type.equals(VOID_NAME))                 datatype = new VoidType();
-    else if (type.equals(DOM_ELEMENT_NAME))          datatype = new DomElementType();
-    else if (type.equals(SOAP_ELEMENT_NAME))         datatype = new SOAPElementType();  
-    else if (type.equals(BIG_DECIMAL_NAME))          datatype = new BigDecimalType();
-    else if (type.equals(BIG_INTEGER_NAME))          datatype = new BigIntegerType();
-    else if (type.equals(DATE_NAME))                  datatype = new DateType();
-    else if (type.equals(URL_NAME))                   datatype = new URLType(); 
-    else if (type.equals(GREGORIAN_CALENDAR_NAME))  datatype = new GregorianCalendarType();
-    else if (type.equals(CALENDAR_NAME))  datatype = new GregorianCalendarType();
-
-    //it could be a return type we support
-    else if (type.equals(HASHTABLE_NAME))            datatype = new HashtableType();
-    else if (type.equals(VECTOR_NAME))               datatype = new VectorType();
-    else if (type.equals(MAP_NAME))                  datatype = new MapType();
-
-    // need to see if it is an object array
-    //or a primitive
-    else if (type.startsWith(ARRAY_NAME)){              
-    	String name = type.substring(21); 
-        if(name.startsWith(PRIM_BOOLEAN_NAME) ||
-          name.startsWith(PRIM_BYTE_NAME)     ||
-          name.startsWith(PRIM_DOUBLE_NAME)  ||
-          name.startsWith(PRIM_FLOAT_NAME)    ||
-          name.startsWith(PRIM_LONG_NAME)    ||
-          name.startsWith(PRIM_INTEGER_NAME)  ||
-          name.startsWith(PRIM_CHAR_NAME)    ||
-          name.startsWith(PRIM_SHORT_NAME))
-            datatype = new PrimitiveArrayType(name);  
-        else
-        	datatype = new ArrayType(name);
-
-    }
-    else if (stateless){
-        datatype = new StateLessBeanType(type);
-
-    }
-
-
-    datatype.setUniqueName(UniqueName);
-    return datatype;
-     
-  }
-  
-  
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/URLType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/URLType.java
deleted file mode 100644
index 9c0fb28..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/URLType.java
+++ /dev/null
@@ -1,57 +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.consumption.datamodel.beanmodel;
-
-/**
-* objects of this class represent a type
-* 
-*/
-public class URLType extends SimpleType 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  /**
-  *Constructor
-  *
-  */
-  public URLType()
-  {
-    super(TypeFactory.URL_NAME);
-  }
- 
-  /**
-  * StringToType gets the string taken by the 
-  * user into proxy form
-  * @return String convert the string to type .
-  */
-  public String StringToType(String name)
-  {
-    String conversion = "new java.net.URL(" + name + ");";
-    return conversion;    
-  }
-
-  /**
-  * The stringConversion function nails out specific conversion methods used among simple types 
-  * This method is to be implemented by SimpleType subclasses
-  * @param String the name of string after the request call
-  * @return String the actual conversion string containing the name.
-  */
-  public String TypeToString(String name)
-  {
-    return name + ".toString()";
-  }
- 
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/VectorType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/VectorType.java
deleted file mode 100644
index 5a0718d..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/VectorType.java
+++ /dev/null
@@ -1,37 +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.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a recognized return type
-* 
-*/
-public class VectorType extends RecognizedReturnType
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  /**
-  *Constructor
-  *
-  */
-  public VectorType()
-  {
-    super(TypeFactory.VECTOR_NAME);
-  }
-
-  
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/VoidType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/VoidType.java
deleted file mode 100644
index 5fde91e..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/VoidType.java
+++ /dev/null
@@ -1,56 +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.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a type
-* 
-*/
-public class VoidType extends SimpleType
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  /**
-  *Constructor
-  *
-  */
-  public VoidType()
-  {
-    super("void");
-  }
-
-   /**
-  * for a void there is no need to return 
-  * @return String convert the string to type .
-  */
-  public String StringToType(String name)
-  {
-    return "";
-  }
-  
-  /**
-  * The stringConversion function nails out specific conversion methods used among simple types 
-  * This method is to be implemented by SimpleType subclasses
-  * @param String the name of string after the request call
-  * @return String the actual conversion string containing the name.
-  */
-  public String TypeToString(String name)
-  {
-    return "String.valueOf(" + name + ")";
-  }
- 
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/validate/ValidationManager.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/validate/ValidationManager.java
deleted file mode 100644
index dba9769..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/validate/ValidationManager.java
+++ /dev/null
@@ -1,129 +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.consumption.datamodel.validate;
-
-import java.util.HashSet;
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceDescription;
-import org.eclipse.core.resources.ResourcesPlugin;
-
-/**
-  * This class manages the validation state of projects that some tasks may want
-  * to disable.  The manager can then be used to restore the validation state.
-**/
-public class ValidationManager
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  /**
-    * This set contains a set of IProjects that need to be validated.
-  **/
-  private HashSet projects = null;              
-
-  /**
-    * This object contains a reference to the j2ee validator.
-  **/
-  //pgm private ValidatorManager j2eeManager = null;
-
-  /**
-    * This boolean contains the auto build setting under preferrence
-  **/
-  private boolean isAutoBuild_;
-  private boolean autoBuildDisabled_;
-                                             
-  public ValidationManager()
-  {
-    projects    = new HashSet();
-    //pgm j2eeManager = ValidatorManager.getManager();
-    setAutoBuildPreference();
-    autoBuildDisabled_ = false;
-  }
-  
-  /**
-    * Disables the validation for a project if required.
-  **/
-  public void disableValidationForProject( IProject project )
-  {    
-    // We need to remember that this project needs have validation turned back on.
-    projects.add( project );
-    
-    //pgm j2eeManager.suspendAllValidation( true );
-  }
-
-  /**
-    * Restores the validation state for all needed projects.
-  **/
-  public void restoreValidationForProjects( boolean runValidation )
-  {
-    //pgm j2eeManager.suspendAllValidation( false );
-    
-    Iterator iterator = projects.iterator();
-
-    while( iterator.hasNext() )
-    {
-      IProject project = (IProject)(iterator.next());
-
-      // Now kick off validation for this project if this was requested.
-      if( runValidation )
-      {
-	    //pgm EnabledValidatorsOperation validOp = new EnabledValidatorsOperation( project, null );
-	    //pgm validOp.run( monitor );
-      }
-    }
-  }
-
-  public void modifyAutoBuild(boolean isAutoBuild) {
-    try {
-      IWorkspace workspace = ResourcesPlugin.getWorkspace();
-      IWorkspaceDescription workspaceDesc = workspace.getDescription();
-      workspaceDesc.setAutoBuilding(isAutoBuild);
-      workspace.setDescription(workspaceDesc);
-    }
-    catch (Exception e) {}
-  }
-
-  public void disableAutoBuild() {
-    if (!autoBuildDisabled_) {
-      setAutoBuildPreference();
-      modifyAutoBuild(false);
-      autoBuildDisabled_ = true;
-    }
-  }
-
-  public void restoreAutoBuild() {
-    if (autoBuildDisabled_) {
-      modifyAutoBuild(getAutoBuildPreference());
-      autoBuildDisabled_ = false;
-    }
-  }
-
-  public boolean setAutoBuildPreference() {
-    isAutoBuild_ = getWorkspaceAutoBuildPreference();
-    return isAutoBuild_;
-  }
-
-  public boolean getAutoBuildPreference() {
-    return isAutoBuild_;
-  }
-
-  public boolean getWorkspaceAutoBuildPreference() {
-    IWorkspaceDescription workspaceDesc = ResourcesPlugin.getWorkspace().getDescription();
-    return workspaceDesc.isAutoBuilding();
-  }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/BindingElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/BindingElement.java
deleted file mode 100644
index 684fb66..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/BindingElement.java
+++ /dev/null
@@ -1,55 +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.consumption.datamodel.wsdlmodel;
-
-import java.util.Enumeration;
-
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-
-
-public class BindingElement extends BasicElement
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
-  public static String REL_PORT = "port";
-  public static String REL_OPERATIONS = "operations";
-  public static String REL_PORT_TYPE = "porttype";
-  
-  public BindingElement (PortElement portElement,String name)
-  {
-    super(name,portElement,REL_PORT,PortElement.REL_BINDING);
-  }
-
-  public Enumeration getPort()
-  {
-    return getElements(REL_PORT);
-  }
-
-  public Enumeration getPortType()
-  {
-    return getElements(REL_PORT_TYPE);
-  }
-
-  public Enumeration getOperations()
-  {
-    return getElements(REL_OPERATIONS);
-  }
-
-  public int getNumberOfOperations()
-  {
-    return getNumberOfElements(REL_OPERATIONS);
-  }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/DefinitionElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/DefinitionElement.java
deleted file mode 100644
index d581564..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/DefinitionElement.java
+++ /dev/null
@@ -1,49 +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.consumption.datamodel.wsdlmodel;
-
-import java.util.Enumeration;
-
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-
-
-public class DefinitionElement extends BasicElement
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
-  public static String REL_SERVICES = "services";
-  public static String REL_WSDL = "wsdl";
-  
-  public DefinitionElement (WSDLElement wsdlElement,String name)
-  {
-    super(name,wsdlElement,REL_WSDL,WSDLElement.REL_DEFINITIONS);
-  }
-
-  public Enumeration getWSDL()
-  {
-    return getElements(REL_WSDL);
-  }
-
-  public Enumeration getServices()
-  {
-    return getElements(REL_SERVICES);
-  }
-
-  public int getNumberOfServices()
-  {
-    return getNumberOfElements(REL_SERVICES);
-  }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/MessageElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/MessageElement.java
deleted file mode 100644
index ed6bb13..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/MessageElement.java
+++ /dev/null
@@ -1,49 +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.consumption.datamodel.wsdlmodel;
-
-import java.util.Enumeration;
-
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-
-
-public class MessageElement extends BasicElement
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
-  public static String REL_OPERATION = "operation";
-  public static String REL_PARTS = "parts";
-  
-  public MessageElement (OperationElement operationElement,String name)
-  {
-    super(name,operationElement,REL_OPERATION,OperationElement.REL_MESSAGES);
-  }
-
-  public Enumeration getOperation()
-  {
-    return getElements(REL_OPERATION);
-  }
-
-  public Enumeration getParts()
-  {
-    return getElements(REL_PARTS);
-  }
-
-  public int getNumberOfParts()
-  {
-    return getNumberOfElements(REL_PARTS);
-  }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/OperationElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/OperationElement.java
deleted file mode 100644
index 890af47..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/OperationElement.java
+++ /dev/null
@@ -1,49 +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.consumption.datamodel.wsdlmodel;
-
-import java.util.Enumeration;
-
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-
-
-public class OperationElement extends BasicElement
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
-  public static String REL_BINDING = "binding";
-  public static String REL_MESSAGES = "messages";
-
-  public OperationElement (BindingElement bindingElement,String name)
-  {
-    super(name,bindingElement,REL_BINDING,BindingElement.REL_OPERATIONS);
-  }
-
-  public Enumeration getBinding()
-  {
-    return getElements(REL_BINDING);
-  }
-
-  public Enumeration getMessages()
-  {
-    return getElements(REL_MESSAGES);
-  }
-
-  public int getNumberOfMessages()
-  {
-    return getNumberOfElements(REL_MESSAGES);
-  }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/PartElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/PartElement.java
deleted file mode 100644
index 26df67a..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/PartElement.java
+++ /dev/null
@@ -1,40 +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.consumption.datamodel.wsdlmodel;
-
-import java.util.Enumeration;
-
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-
-
-public class PartElement extends BasicElement
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
-  public static String REL_MESSAGE = "message";
-    
-  public PartElement (MessageElement messageElement,String name)
-  {
-    super(name,messageElement,REL_MESSAGE,MessageElement.REL_PARTS);
-  }
-
-  public Enumeration getMessage()
-  {
-    return getElements(REL_MESSAGE);
-  }
-
-  
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/PortElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/PortElement.java
deleted file mode 100644
index 4ea80e0..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/PortElement.java
+++ /dev/null
@@ -1,45 +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.consumption.datamodel.wsdlmodel;
-
-import java.util.Enumeration;
-
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-
-
-public class PortElement extends BasicElement
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
-  public static String REL_BINDING = "binding";
-  public static String REL_SERVICE = "service";
-  
-  public PortElement (ServiceElement serviceElement,String name)
-  {
-    super(name,serviceElement,REL_SERVICE,ServiceElement.REL_PORTS);
-  }
-
-  public Enumeration getService()
-  {
-    return getElements(REL_SERVICE);
-  }
-
-  public Enumeration getBinding()
-  {
-    return getElements(REL_BINDING);
-  }
- 
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/PortTypeElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/PortTypeElement.java
deleted file mode 100644
index fdacced..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/PortTypeElement.java
+++ /dev/null
@@ -1,40 +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.consumption.datamodel.wsdlmodel;
-
-import java.util.Enumeration;
-
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-
-
-public class PortTypeElement extends BasicElement
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
-  public static String REL_BINDING = "binding";
-  
-  public PortTypeElement (BindingElement bindingElement,String name)
-  {
-    super(name,bindingElement,REL_BINDING,BindingElement.REL_PORT_TYPE);
-  }
-
-  public Enumeration getBinding()
-  {
-    return getElements(REL_BINDING);
-  }
-
- 
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/ServiceElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/ServiceElement.java
deleted file mode 100644
index ece8634..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/ServiceElement.java
+++ /dev/null
@@ -1,49 +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.consumption.datamodel.wsdlmodel;
-
-import java.util.Enumeration;
-
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-
-
-public class ServiceElement extends BasicElement
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
-  public static String REL_PORTS = "ports";
-  public static String REL_DEFINITION = "definition";
-  
-  public ServiceElement (DefinitionElement definitionElement,String name)
-  {
-    super(name,definitionElement,REL_DEFINITION,DefinitionElement.REL_SERVICES);
-  }
-
-  public Enumeration getDefinition()
-  {
-    return getElements(REL_DEFINITION);
-  }
-
-  public Enumeration getPorts()
-  {
-    return getElements(REL_PORTS);
-  }
-
-  public int getNumberOfPorts()
-  {
-    return getNumberOfElements(REL_PORTS);
-  }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/StubbedWSDLModel.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/StubbedWSDLModel.java
deleted file mode 100644
index 695e228..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/StubbedWSDLModel.java
+++ /dev/null
@@ -1,69 +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.consumption.datamodel.wsdlmodel;
-
-import org.eclipse.wst.ws.internal.datamodel.Model;
-
-public class StubbedWSDLModel
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
-  protected Model fModel;
-  public StubbedWSDLModel()
-  {
-    WSDLElement wsdlElement = new WSDLElement("WSDLFiles");
-    fModel = wsdlElement.getModel();   
-  }
-
-  public Model getWSDLModel()
-  {
-    return fModel;
-  }
-
-  public void buildModel()
-  {
-    DefinitionElement def1 = new DefinitionElement((WSDLElement)fModel.getRootElement(),"StockQuote"); 
-    ServiceElement ser1 = new ServiceElement(def1,"getQuote");
-    ServiceElement ser2 = new ServiceElement(def1,"setQuote");
-    PortElement port1 = new PortElement(ser1,"port1");
-    PortElement port2 = new PortElement(ser1,"port2");
-    PortElement port3 = new PortElement(ser2,"port1");
-    PortElement port4 = new PortElement(ser2,"port2");
-    BindingElement bind1 = new BindingElement(port1,"bind1");
-    BindingElement bind2 = new BindingElement(port2,"bind1");
-    BindingElement bind3 = new BindingElement(port3,"bind1");
-    BindingElement bind4 = new BindingElement(port4,"bind1");
-    OperationElement op1 = new OperationElement(bind1,"op1");
-    OperationElement op2 = new OperationElement(bind2,"op1");
-    OperationElement op3 = new OperationElement(bind3,"op1");
-    OperationElement op4 = new OperationElement(bind4,"op1");
-    MessageElement me1 = new MessageElement(op1,"me1");
-    MessageElement me2 = new MessageElement(op1,"me2");
-    PartElement pe1  = new PartElement(me1,"pe1");
-    PartElement pe2  = new PartElement(me2,"pe2");
-
-    DefinitionElement def2 = new DefinitionElement((WSDLElement)fModel.getRootElement(),"TempConversion"); 
-    ServiceElement ser3 = new ServiceElement(def2,"getTemp");
-    ServiceElement ser4 = new ServiceElement(def2,"setTemp");
-    PortElement port5 = new PortElement(ser3,"port1");
-    PortElement port6 = new PortElement(ser4,"port1");
-    BindingElement bind5 = new BindingElement(port5,"bind1");
-    BindingElement bind6 = new BindingElement(port6,"bind1");
-    OperationElement op5 = new OperationElement(bind5,"op1");
-    OperationElement op6 = new OperationElement(bind6,"op1");
-
-  }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/WSDLElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/WSDLElement.java
deleted file mode 100644
index f1aa78a..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/WSDLElement.java
+++ /dev/null
@@ -1,54 +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.consumption.datamodel.wsdlmodel;
-
-import java.util.Enumeration;
-
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-import org.eclipse.wst.ws.internal.datamodel.BasicModel;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-
-
-public class WSDLElement extends BasicElement
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
-  public static String REL_DEFINITIONS = "definitions";
-  
-  /*
-  *
-  **/
-  public WSDLElement (String name)
-  {
-    this(name,new BasicModel("WSDLModel"));
-  }
-
-  public WSDLElement (String name, Model model)
-  {
-    super(name,model);
-    model.setRootElement(this);
-  }
-
-  public Enumeration getDefinitions()
-  {
-    return getElements(REL_DEFINITIONS);
-  }
-
-  public int getNumberOfDefinitions()
-  {
-    return getNumberOfElements(REL_DEFINITIONS);
-  }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ClientPreAssemblyFragment.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ClientPreAssemblyFragment.java
deleted file mode 100644
index 6b479a7..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ClientPreAssemblyFragment.java
+++ /dev/null
@@ -1,17 +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.consumption.fragments;
-
-import org.eclipse.wst.command.env.core.fragment.SequenceFragment;
-
-public class ClientPreAssemblyFragment extends SequenceFragment
-{
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ClientPreDeployFragment.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ClientPreDeployFragment.java
deleted file mode 100644
index d59ebf7..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ClientPreDeployFragment.java
+++ /dev/null
@@ -1,17 +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.consumption.fragments;
-
-import org.eclipse.wst.command.env.core.fragment.SequenceFragment;
-
-public class ClientPreDeployFragment extends SequenceFragment
-{
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ClientPreDevelopFragment.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ClientPreDevelopFragment.java
deleted file mode 100644
index e375dd3..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ClientPreDevelopFragment.java
+++ /dev/null
@@ -1,17 +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.consumption.fragments;
-
-import org.eclipse.wst.command.env.core.fragment.SequenceFragment;
-
-public class ClientPreDevelopFragment extends SequenceFragment
-{
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ClientPreInstallFragment.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ClientPreInstallFragment.java
deleted file mode 100644
index a3e94a0..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ClientPreInstallFragment.java
+++ /dev/null
@@ -1,17 +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.consumption.fragments;
-
-import org.eclipse.wst.command.env.core.fragment.SequenceFragment;
-
-public class ClientPreInstallFragment extends SequenceFragment
-{
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ServicePreAssemblyFragment.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ServicePreAssemblyFragment.java
deleted file mode 100644
index 2dd56f3..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ServicePreAssemblyFragment.java
+++ /dev/null
@@ -1,17 +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.consumption.fragments;
-
-import org.eclipse.wst.command.env.core.fragment.SequenceFragment;
-
-public class ServicePreAssemblyFragment extends SequenceFragment
-{
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ServicePreDeployFragment.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ServicePreDeployFragment.java
deleted file mode 100644
index 1ff4a49..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ServicePreDeployFragment.java
+++ /dev/null
@@ -1,17 +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.consumption.fragments;
-
-import org.eclipse.wst.command.env.core.fragment.SequenceFragment;
-
-public class ServicePreDeployFragment extends SequenceFragment
-{
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ServicePreDevelopFragment.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ServicePreDevelopFragment.java
deleted file mode 100644
index 1e2316c..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ServicePreDevelopFragment.java
+++ /dev/null
@@ -1,17 +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.consumption.fragments;
-
-import org.eclipse.wst.command.env.core.fragment.SequenceFragment;
-
-public class ServicePreDevelopFragment extends SequenceFragment
-{
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ServicePreInstallFragment.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ServicePreInstallFragment.java
deleted file mode 100644
index a71790c..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ServicePreInstallFragment.java
+++ /dev/null
@@ -1,17 +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.consumption.fragments;
-
-import org.eclipse.wst.command.env.core.fragment.SequenceFragment;
-
-public class ServicePreInstallFragment extends SequenceFragment
-{
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/plugin/WebServiceConsumptionPlugin.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/plugin/WebServiceConsumptionPlugin.java
deleted file mode 100644
index 184a774..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/plugin/WebServiceConsumptionPlugin.java
+++ /dev/null
@@ -1,94 +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.consumption.plugin;
-
-import java.text.MessageFormat;
-
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.wst.command.env.core.common.Log;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-
-/**
-* This is the plugin class for the Web Services plugin.
-* <p>
-* This plugin contains the bulk of the Web Services runtime.
-* Only the graphical user interface portion of the runtime is
-* found elsewhere - in the org.eclipse.jst.ws.ui plugin.
-*/
-public class WebServiceConsumptionPlugin extends Plugin
-{
-  // 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.consumption";
-
-  /**
-  * The reference to the singleton instance of this plugin.
-  */
-  private static WebServiceConsumptionPlugin instance_;
-
-  private Log log_;
- 
-  /**
-  * Constructs a runtime plugin object for this plugin.
-  */
-  public WebServiceConsumptionPlugin ()
-  {
-    super();
-    instance_ = this;
-  }
-
-  /**
-  * Returns the singleton instance of this plugin. Equivalent to calling
-  * (WebServiceConsumptionPlugin)Platform.getPlugin("org.eclipse.jst.ws");
-  * @return The WebServiceConsumptionPlugin singleton.
-  */
-  public static WebServiceConsumptionPlugin 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.consumption.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);
-  }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileAttributeGenerator.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileAttributeGenerator.java
deleted file mode 100644
index 436e45d..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileAttributeGenerator.java
+++ /dev/null
@@ -1,73 +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.consumption.sampleapp.codegen;
-
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.TypeVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.AttributeElementType;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.BeanElement;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeFactory;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-
-
-/**
-* Objects of this class represent a InputFileTypeGenerator.
-* */
-public class InputFileAttributeGenerator extends InputFileTypeGenerator 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-   
-  private boolean fStateLess;
-
-  /**
-  * Constructor.
-  * 
-  */
-  public InputFileAttributeGenerator (StringBuffer buffer, int currentLevel, int levelsDeep)
-  {
-     super(buffer,currentLevel,levelsDeep);
-  }
-
- 
-  /*
-  * Takes in an object to be acted upon by this visitor action
-  * @param Object The object to be acted upon
-  */
-  public Status visit (Object object)
-  {
-     
-     AttributeElementType attributeElementType = (AttributeElementType)object;
-     //if it is a bean is it stateless
-     attributeElementType.getTypeElement(); 
-        
-     if(attributeElementType.getTypeElement().isBean()){
-       BeanElement bean = (BeanElement)attributeElementType.getTypeElement();
-       fStateLess = bean.isStateLess();
-     }	 
-
-     TypeVisitor typeVisitor = new TypeVisitor();
-     InputFileTypeGenerator inputFileTypeGenerator = new InputFileTypeGenerator(fbuffer,fCurrentLevel,fLevelsDeep);
-     if(attributeElementType.getTypeElement().isBean() && !TypeFactory.recognizedBean(attributeElementType.getTypeElement().getName()) 
-     	&& !(getReturnParam() && (TypeFactory.isRecognizedReturnType(attributeElementType.getTypeElement().getTypeName()) || fStateLess)))
-                
-     addParentGetter(attributeElementType.getGetterMethod(),attributeElementType.getTypeElement().getName());
-     inputFileTypeGenerator.addParentGetter(returnParentGetter(),returnParentGetterType());
-     inputFileTypeGenerator.setInstanceName(fInstanceName);
-     inputFileTypeGenerator.setReturnParam(getReturnParam());
-     typeVisitor.run(attributeElementType,inputFileTypeGenerator);   
-     fbuffer = inputFileTypeGenerator.getStringBuffer();
-     
-     return new SimpleStatus("");
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileGenerator.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileGenerator.java
deleted file mode 100644
index 72f8fdf..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileGenerator.java
+++ /dev/null
@@ -1,138 +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.consumption.sampleapp.codegen;
-
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.MethodVisitor;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-
-
-/**
-* Objects of this class represent a MethodFilegenerator.
-* */
-public class InputFileGenerator extends Generator 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-   
-  public String fResultName;
-
-  /**
-  * Constructor.
-  * used directly 
-  */
-  public InputFileGenerator (String result)
-  {
-      super();
-      fResultName = result;
-  }
-
-  /**
-  * Constructor.
-  * called from subclasses
-  */
-  public InputFileGenerator (StringBuffer buffer, String result)
-  {
-      super(buffer);
-      fResultName = result;
-  }
-
-  /**
-  * Constructor.
-  * called from subclasses
-  */
-  public InputFileGenerator (StringBuffer buffer)
-  {
-      super(buffer);
-  }
-  
-  public void setFileNames(String results)
-  {
-    fResultName = results;
-  }
-
-  //takes in a bean node
-   public Status visit (Object object)
-   {
-      Element beanElement = (Element)object;
-      fbuffer.append("<%@page contentType=\"text/html;charset=UTF-8\"%>" + StringUtils.NEWLINE);
-      fbuffer.append("<HTML>" + StringUtils.NEWLINE);
-      fbuffer.append("<HEAD>" + StringUtils.NEWLINE);
-      fbuffer.append("<TITLE>Inputs</TITLE>" + StringUtils.NEWLINE);
-      fbuffer.append("</HEAD>" + StringUtils.NEWLINE);
-      fbuffer.append("<BODY>" + StringUtils.NEWLINE);
-      fbuffer.append("<H1>Inputs</H1>" + StringUtils.NEWLINE + "" + StringUtils.NEWLINE);
-      fbuffer.append("<%" + StringUtils.NEWLINE + "String method = request.getParameter(\"method\");" + StringUtils.NEWLINE);
-      fbuffer.append("int methodID = 0;" + StringUtils.NEWLINE);
-      fbuffer.append("if (method == null) methodID = -1;" + StringUtils.NEWLINE + "" + StringUtils.NEWLINE);
-      fbuffer.append("boolean valid = true;" + StringUtils.NEWLINE + StringUtils.NEWLINE);
-
-      fbuffer.append("if(methodID != -1) methodID = Integer.parseInt(method);" + StringUtils.NEWLINE); 
-      fbuffer.append("switch (methodID){ " + StringUtils.NEWLINE);
-      	
-      // go to the next generator
-      MethodVisitor methodVisitor = new MethodVisitor();
-      InputFileHelp1Generator inputFileHelp1Generator = new InputFileHelp1Generator(fbuffer,fResultName); 
-      methodVisitor.run(beanElement,inputFileHelp1Generator);
-      fbuffer = inputFileHelp1Generator.getStringBuffer();
-
-      fbuffer.append("case 1111111111:" + StringUtils.NEWLINE);
-      fbuffer.append("valid = false;" + StringUtils.NEWLINE);
-      fbuffer.append("%>" + StringUtils.NEWLINE);
-      fbuffer.append("<FORM METHOD=\"POST\" ACTION=\"" + fResultName + "\" TARGET=\"result\">" + StringUtils.NEWLINE);
-      fbuffer.append("<INPUT TYPE=\"HIDDEN\" NAME=\"method\" VALUE=\"<%=method%>\">" + StringUtils.NEWLINE);
-      fbuffer.append("<TABLE>" + StringUtils.NEWLINE);
-      fbuffer.append("<TR>" + StringUtils.NEWLINE);
-      fbuffer.append("<TD COLSPAN=\"1\" ALIGN=\"LEFT\">URLString:</TD>" + StringUtils.NEWLINE);
-      fbuffer.append("<TD ALIGN=\"left\"><INPUT TYPE=\"TEXT\" NAME=\"url1111111111\" SIZE=20></TD>" + StringUtils.NEWLINE);
-      fbuffer.append("</TR>" + StringUtils.NEWLINE);
-      fbuffer.append("</TABLE>" + StringUtils.NEWLINE);
-      fbuffer.append("<BR>" + StringUtils.NEWLINE);
-      fbuffer.append("<INPUT TYPE=\"SUBMIT\" VALUE=\"Invoke\">" + StringUtils.NEWLINE);
-      fbuffer.append("<INPUT TYPE=\"RESET\" VALUE=\"Clear\">" + StringUtils.NEWLINE);
-      fbuffer.append("</FORM>" + StringUtils.NEWLINE);
-      fbuffer.append("<%" + StringUtils.NEWLINE);
-      fbuffer.append("break;" + StringUtils.NEWLINE);
-      fbuffer.append("case 1111111112:" + StringUtils.NEWLINE);
-      fbuffer.append("valid = false;" + StringUtils.NEWLINE);
-      fbuffer.append("%>" + StringUtils.NEWLINE);
-      fbuffer.append("<FORM METHOD=\"POST\" ACTION=\"" + fResultName + "\" TARGET=\"result\">" + StringUtils.NEWLINE);
-      fbuffer.append("<INPUT TYPE=\"HIDDEN\" NAME=\"method\" VALUE=\"<%=method%>\">" + StringUtils.NEWLINE);
-      fbuffer.append("<BR>" + StringUtils.NEWLINE);
-      fbuffer.append("<INPUT TYPE=\"SUBMIT\" VALUE=\"Invoke\">" + StringUtils.NEWLINE);
-      fbuffer.append("<INPUT TYPE=\"RESET\" VALUE=\"Clear\">" + StringUtils.NEWLINE);
-      fbuffer.append("</FORM>" + StringUtils.NEWLINE);
-      fbuffer.append("<%" + StringUtils.NEWLINE);
-      fbuffer.append("break;" + StringUtils.NEWLINE);
-      
-      
-
-      fbuffer.append("}" + StringUtils.NEWLINE);    
-      fbuffer.append("if (valid) {" + StringUtils.NEWLINE);
-      fbuffer.append("%>" + StringUtils.NEWLINE + "Select a method to test." + StringUtils.NEWLINE);  
-      fbuffer.append("<%" + StringUtils.NEWLINE);
-      fbuffer.append(Generator.TAB + "return;" + StringUtils.NEWLINE);
-      fbuffer.append("}" + StringUtils.NEWLINE);
-      fbuffer.append("%>" + StringUtils.NEWLINE + StringUtils.NEWLINE);
-      fbuffer.append("</BODY>" + StringUtils.NEWLINE);
-      fbuffer.append("</HTML>" + StringUtils.NEWLINE);
-      
-      return new SimpleStatus("");
-
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileHelp1Generator.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileHelp1Generator.java
deleted file mode 100644
index a3b49ff..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileHelp1Generator.java
+++ /dev/null
@@ -1,93 +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.consumption.sampleapp.codegen;
-
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.ParameterVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.MethodElement;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-
-
-/**
-* Objects of this class represent a InputFileHelp1Generator.
-* */
-public class InputFileHelp1Generator extends InputFileGenerator 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-   
-  public static final int INITIAL_STATE = 1;
-  public static final int FINAL_STATE = 2;
-
-  public int fstate;
-   
-  /**
-  * Constructor.
-  * 
-  */
-  public InputFileHelp1Generator (StringBuffer buffer)
-  {
-      super(buffer);
-      fstate = INITIAL_STATE;
-  }
-  
-  /**
-  * Constructor.
-  * 
-  */
-  public InputFileHelp1Generator (StringBuffer buffer,String resultName)
-  {
-      super(buffer,resultName);
-      fstate = INITIAL_STATE;
-  }
-  
-  /*
-  * Takes in an element
-  * @param Object Takes in an object to be acted upon
-  */
-  public Status visit (Object object)
-  {
-     Element methodElement = (Element)object;
-     MethodElement method = (MethodElement)methodElement;
-     if (method.getMethodOmmission()) return new SimpleStatus("");
-     
-     ParameterVisitor parameterVisitor = new ParameterVisitor();
-     fbuffer.append("case " + method.getNumberID()+ ":" + StringUtils.NEWLINE);
-     fbuffer.append("valid = false;" + StringUtils.NEWLINE);
-     fbuffer.append("%>" + StringUtils.NEWLINE);
-     fbuffer.append("<FORM METHOD=\"POST\" ACTION=\"" + fResultName + "\" TARGET=\"result\">" + StringUtils.NEWLINE);
-     fbuffer.append("<INPUT TYPE=\"HIDDEN\" NAME=\"method\" VALUE=\"<%=method%>\">" + StringUtils.NEWLINE);
-    
-     // go to the next generator
-     InputFileHelp2Generator inputFileHelp2Generator = new InputFileHelp2Generator(fbuffer); 
-     parameterVisitor.run(methodElement,inputFileHelp2Generator);
-     fbuffer = inputFileHelp2Generator.getStringBuffer();
-     
-     fbuffer.append("<BR>" + StringUtils.NEWLINE);
-     fbuffer.append("<INPUT TYPE=\"SUBMIT\" VALUE=\"Invoke\">" + StringUtils.NEWLINE);
-     fbuffer.append("<INPUT TYPE=\"RESET\" VALUE=\"Clear\">" + StringUtils.NEWLINE);
-     fbuffer.append("</FORM>" + StringUtils.NEWLINE);
-     fbuffer.append("<%" + StringUtils.NEWLINE);
-     fbuffer.append("break;" + StringUtils.NEWLINE);
-      
-
-     return new SimpleStatus("");
-     
-  
-  }   
-  
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileHelp2Generator.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileHelp2Generator.java
deleted file mode 100644
index e26c287..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileHelp2Generator.java
+++ /dev/null
@@ -1,105 +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.consumption.sampleapp.codegen;
-
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.RelVisitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.TypeVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.ParameterElement;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-
-
-/**
-* Objects of this class represent a InputFileHelp2Generator.
-* */
-public class InputFileHelp2Generator extends InputFileHelp1Generator 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-   
-  /*
-  * This is actually used by the result generator to show the 
-  * resultant Bean
-  * The name is the name the resultant bean is using as its instance name
-  */
-  protected String fInstanceName;
-  private boolean fReturnParam=false;
-
-  /**
-  * Constructor.
-  * 
-  */
-  public InputFileHelp2Generator (StringBuffer buffer)
-  {
-      super(buffer);
-      fInstanceName="";
-  }
-
-  /**
-  * This is state data to be used by the generators
-  * @param String name The instance name of the parameters type bean
-  */
-  public void setInstanceName(String name)
-  {
-    fInstanceName = name;
-  }
-
-  /**
-  * This is state data to be used by the generators
-  * @return String name The instance name of the parameters type bean
-  */
-  public String getInstanceName()
-  {
-    return fInstanceName;
-  }
-
-
-  /*
-  * Takes in an object to be acted upon by this visitor action
-  * @param Object The object to be acted upon
-  */
-  public Status visit (Object object)
-  {
-      Element parameterElement = (Element)object;
-      RelVisitor visitor = (RelVisitor)getVisitor();
-      ParameterElement parameter = (ParameterElement)parameterElement;
-
-      fbuffer.append("<TABLE>" + StringUtils.NEWLINE);
-
-      TypeVisitor typeVisitor = new TypeVisitor();
-      InputFileTypeGenerator inputFileTypeGenerator = new InputFileTypeGenerator(fbuffer,0);
-      inputFileTypeGenerator.setReturnParam(getReturnParam());
-      inputFileTypeGenerator.setInstanceName(fInstanceName);
-      typeVisitor.run(parameterElement,inputFileTypeGenerator);
-      fbuffer = inputFileTypeGenerator.getStringBuffer();
-
-      fbuffer.append("</TABLE>" + StringUtils.NEWLINE);
-      
-      return new SimpleStatus("");
-  
-  }
-
-  public boolean getReturnParam()
-  {
-    return fReturnParam;
-  }
-
-  public void setReturnParam(boolean returnParam)
-  {
-    fReturnParam = returnParam;
-  } 
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileTypeGenerator.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileTypeGenerator.java
deleted file mode 100644
index ee13447..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileTypeGenerator.java
+++ /dev/null
@@ -1,292 +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.consumption.sampleapp.codegen;
-
-import java.util.Vector;
-
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.AttributeVisitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.FieldVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.AttributeElementType;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.BeanElement;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.DataType;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.SimpleElement;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeElement;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeFactory;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-
-
-/**
-* Objects of this class represent a InputFileTypeGenerator.
-* */
-public class InputFileTypeGenerator extends InputFileHelp2Generator 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-   
-  protected String fParentGetters;
-  protected int fLevelsDeep;
-  protected int fColspan;
-  protected int fCurrentLevel;
-  private boolean fIsSimple;
-  private boolean fStateLessBean;
-  private Vector fGetters;
-  private Vector fTypes;
-
-  /**
-  * Constructor.
-  * 
-  */
-  public InputFileTypeGenerator (StringBuffer buffer, int currentLevel)
-  {
-     super(buffer);
-     fCurrentLevel = currentLevel;
-     fLevelsDeep = -1;
-     fParentGetters = "";
-  }
-
-  /**
-  * Constructor.
-  * 
-  */
-  public InputFileTypeGenerator (StringBuffer buffer, int currentLevel,int levelsDeep)
-  {
-     super(buffer);
-     fCurrentLevel = currentLevel;
-     fLevelsDeep = levelsDeep;
-     fParentGetters = "";
-  }
-
-  public void setParentGetters(Vector getter,Vector type)
-  {
-     if(fGetters != null){
-       fGetters.clear();
-       fTypes.clear();
-     }
-     addParentGetter(getter,type);
-  }
-
-
-  /**
-  * This function holds some state data that is important in getting the 
-  * Strings for display of resultant beans
-  * @param String getter this is the getter of an attribute
-  * The idea is that by the time we get to the simple type
-  * we have getAddress().getStreet()....
-  */
-  public void addParentGetter(String getter, String type)
-  {
-    if(fGetters == null) fGetters = new Vector();
-    if(fTypes == null) fTypes = new Vector();
-    fGetters.addElement(getter);
-    fTypes.addElement(type);
-  }
-
-  /*
-  * this will be used when passing between two visitors
-  *
-  */
-  public void addParentGetter(Vector getters, Vector types)
-  {
-    if(fGetters == null) fGetters = new Vector();
-    if(fTypes == null) fTypes = new Vector();
-    int size = getters.size();    
-    for(int i = 0; i<size; i++){
-      fGetters.addElement(getters.get(i));
-      fTypes.addElement(types.get(i));
-    }
-  }
-
-  protected String returnParentGetter(int count)
-  {
-    if (fGetters == null || count > fGetters.size()) return null;
-    return (String)fGetters.get(count);  
-  }
-
-  protected String returnParentGetterType(int count)
-  {
-    if (fTypes == null || count > fTypes.size()) return null;
-    return (String)fTypes.get(count);  
-  }
-
-  protected Vector returnParentGetter()
-  {
-    if (fGetters == null ) return new Vector();
-    return fGetters;  
-  }
-
-  protected Vector returnParentGetterType()
-  {
-    if (fTypes == null ) return new Vector();
-    return fTypes;  
-  }
-
-  protected int getterCount()
-  {
-    if(fGetters == null) return 0;
-    return fGetters.size(); 
-  }
-
-
-  /**
-  * This function returns some state data that is important in getting the 
-  * Strings for display of resultant beans
-  * @return String the string of getters to this point
-  * The idea is that by the time we get to the simple type
-  * we have getAddress().getStreet()....
-  */
-  public String getParentGetters()
-  {
-    return fParentGetters;
-  }
-  
-  /*
-  * Takes in an object to be acted upon by this visitor action
-  * @param Object The object to be acted upon
-  */
-  public Status visit (Object object)
-  {
-     TypeElement element = (TypeElement)object;
-          
-     if (element instanceof SimpleElement) fIsSimple = true;
-     else fIsSimple = false;
-
-     //this could be a statelessbean need to know
-     if (element instanceof BeanElement ){
-        BeanElement bean = (BeanElement)element;
-        if (bean.isStateLess()) fStateLessBean = true;
-     }
-
-
-
-     //Complex type support
-     //first I need to find out how many levels deep
-     if(fLevelsDeep == -1){
-        AttributeVisitor attributeVisitor = new AttributeVisitor();
-        LevelsDeepVisitorAction ldva = new LevelsDeepVisitorAction();
-        attributeVisitor.run(element,ldva);
-        fLevelsDeep = ldva.getLevelsDeep();
-        //check out the fields 
-        FieldVisitor fieldVisitor = new FieldVisitor();
-        LevelsDeepVisitorAction ldva2 = new LevelsDeepVisitorAction();
-        fieldVisitor.run(element,ldva2);
-
-        if(fLevelsDeep < ldva2.getLevelsDeep())fLevelsDeep = ldva2.getLevelsDeep(); 
-        fLevelsDeep++;
-     } 
-     fColspan = fLevelsDeep - fCurrentLevel;
-
-     //if we have a return param with no getter make sure we are on the 
-     //attribute and not the parameter then return
-     if(getReturnParam() &&  element.getOwningElement() instanceof AttributeElementType &&(((AttributeElementType)element.getOwningElement()).getGetterMethod() == null) ) return new SimpleStatus("");
-
-     //Code gen for all elements
-     fbuffer.append("<TR>" + StringUtils.NEWLINE);
-     for (int i = 0; i < fCurrentLevel;i++){
-        fbuffer.append("<TD WIDTH=\"5%\"></TD>" + StringUtils.NEWLINE);
-     }
-     fbuffer.append("<TD COLSPAN=\"" + fColspan + "\" ALIGN=\"LEFT\">" + element.getOwningElement().getName() + ":</TD>" + StringUtils.NEWLINE);   
-     if(fIsSimple || TypeFactory.recognizedBean(element.getName()) 
-                || (getReturnParam() && fStateLessBean) 
-                || (getReturnParam() && TypeFactory.isRecognizedReturnType(element.getTypeName()))){
-        if(getInstanceName().equals("")){
-           DataType dataType = TypeFactory.createType(element.getName(),element.getOwningElement().getMUID());
-           fbuffer.append(dataType.inputForm(element.getOwningElement().getMUID()));
-        }
-        else{
-           if(getReturnParam() && (TypeFactory.isRecognizedReturnType(element.getTypeName()) || fStateLessBean)){
-             DataType dataType = TypeFactory.createType(element.getTypeName(),element.getOwningElement().getMUID());  
-             String uniqueName = "type" + dataType.getUniqueName();
-             fbuffer.append("<TD>" + StringUtils.NEWLINE);
-             fbuffer.append("<%" + StringUtils.NEWLINE);
-             fbuffer.append("if(" +  getInstanceName() + " != null){" + StringUtils.NEWLINE);
-             String afterString = getInstanceName(); 
-             String tmpString = "tebece";
-             String prevString = getInstanceName();
-             String newTmpString = "";
-             for(int i=0;i<getterCount();i++){
-               newTmpString = tmpString + i;
-               fbuffer.append(returnParentGetterType(i) + " " + newTmpString + "=" + prevString + "." + returnParentGetter(i) + ";" + StringUtils.NEWLINE);
-               prevString = newTmpString; 
-               fbuffer.append("if(" + newTmpString + " != null){" + StringUtils.NEWLINE);
-               afterString = newTmpString;
-             }
-             fbuffer.append(element.getName() + " " + uniqueName + " = " + afterString + "." + ((AttributeElementType)element.getOwningElement()).getGetterMethod()+ ";" + StringUtils.NEWLINE);             
-             fbuffer.append(dataType.TypeConversion(uniqueName));
-             for(int i=0;i<getterCount();i++){
-               fbuffer.append("}");
-             }
-             fbuffer.append("}%>" + StringUtils.NEWLINE);
-             fbuffer.append("</TD>" + StringUtils.NEWLINE);
-           }
-
-           else{ 
-             fbuffer.append("<TD>" + StringUtils.NEWLINE);
-             fbuffer.append("<%" + StringUtils.NEWLINE);
-             fbuffer.append("if(" +  getInstanceName() + " != null){" + StringUtils.NEWLINE);
-             String afterString = getInstanceName();
-             String tmpString = "tebece";
-             String prevString = getInstanceName();
-             String newTmpString = "";
-             for(int i=0;i<getterCount();i++){
-               newTmpString = tmpString + i;
-               fbuffer.append(returnParentGetterType(i) + " " + newTmpString + "=" + prevString + "." + returnParentGetter(i) + ";" + StringUtils.NEWLINE);
-               prevString = newTmpString; 
-               fbuffer.append("if(" + newTmpString + " != null){" + StringUtils.NEWLINE);
-               afterString = newTmpString;
-             }
-             fbuffer.append("%>" + StringUtils.NEWLINE);
-             fbuffer.append("<%=");
-             fbuffer.append(afterString + "." + ((AttributeElementType)element.getOwningElement()).getGetterMethod()+ StringUtils.NEWLINE);
-             fbuffer.append("%>");
-             fbuffer.append("<%");
-             for(int i=0;i<getterCount();i++){
-               fbuffer.append("}");
-             }
-             fbuffer.append("}%>" + StringUtils.NEWLINE);
-             fbuffer.append("</TD>" + StringUtils.NEWLINE);
-           }
-        }
-       
-     }
-         
-      //Now carry on down the rest of the bean
-     else {
-        AttributeVisitor attributeVisitor = new AttributeVisitor();
-        attributeVisitor.setResidentVector1(returnParentGetter());
-        attributeVisitor.setResidentVector2(returnParentGetterType());
-        InputFileAttributeGenerator inputFileAttributeGenerator = new InputFileAttributeGenerator(fbuffer,(fCurrentLevel + 1),fLevelsDeep);
-        inputFileAttributeGenerator.setReturnParam(getReturnParam());
-        inputFileAttributeGenerator.setInstanceName(fInstanceName);
-        attributeVisitor.run(element,inputFileAttributeGenerator);
-        fbuffer = inputFileAttributeGenerator.getStringBuffer();
-       
-        //now do fields very similar
-        FieldVisitor fieldVisitor = new FieldVisitor();
-        fieldVisitor.setResidentVector1(returnParentGetter());
-        fieldVisitor.setResidentVector2(returnParentGetterType());
-        InputFileAttributeGenerator inputFileAttributeGenerator2 = new InputFileAttributeGenerator(fbuffer,(fCurrentLevel + 1),fLevelsDeep);
-        inputFileAttributeGenerator2.setReturnParam(getReturnParam());
-        inputFileAttributeGenerator2.setInstanceName(fInstanceName);
-        fieldVisitor.run(element,inputFileAttributeGenerator2);
-        fbuffer = inputFileAttributeGenerator2.getStringBuffer();
-       
-        
-
-     }
-
-
-      return new SimpleStatus("");
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/LevelsDeepVisitorAction.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/LevelsDeepVisitorAction.java
deleted file mode 100644
index f214126..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/LevelsDeepVisitorAction.java
+++ /dev/null
@@ -1,121 +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.consumption.sampleapp.codegen;
-
-import org.eclipse.jst.ws.internal.consumption.codegen.Visitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.VisitorAction;
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.AttributeVisitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.FieldVisitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.TypeVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.AttributeElement;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.BeanElement;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeElement;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeFactory;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-
-
-/**
-* Objects of this class represent a LevelsDeepVisitorAction.
-* */
-public class LevelsDeepVisitorAction implements VisitorAction 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
-  private Visitor fVisitor;
-  private int fLevelsDeep;
-  private int fDeepestLevel;
-  
-  /**
-  * Constructor.
-  * This is the starting point
-  * 
-  */
-  public LevelsDeepVisitorAction ()
-  {
-    fLevelsDeep = 0;
-  }
-
-  /**
-  * Constructor.
-  * This is the starting point
-  * 
-  */
-  public LevelsDeepVisitorAction (int current,boolean increment)
-  {
-    fLevelsDeep = current;
-    if(increment) fLevelsDeep++;
-    fDeepestLevel = fLevelsDeep; 
-  }
-  
-  public void initialize(String resident)
-  {
-    //nothing to be done but must be implemented
-  }
-
-
-
-  /**
-  * The visitor that called this VisitorAction
-  * @param visitor the visitor that called this visitor action
-  */
-  public void setVisitor(Visitor visitor)
-  {
-     fVisitor = visitor;
-  }
-
-
-  /**
-  * Returns the level of nesting within this bean
-  * @return int returns the int number representing the number of nests of this bean
-  */
-  public int getLevelsDeep()
-  {
-     return fDeepestLevel;
-  }
- 
-
-  /**
-  * Takes in an object to be acted upon by this visitor action
-  * @param Object The object to be acted upon
-  */
-  public Status visit (Object object)
-  {
-      Element element = (Element)object;
-      if (element instanceof AttributeElement || element instanceof TypeElement){
-         TypeVisitor typeVisitor = new TypeVisitor();
-         LevelsDeepVisitorAction lvda = new LevelsDeepVisitorAction(fLevelsDeep,true);
-         typeVisitor.run(element,lvda);
-
-         if (lvda.getLevelsDeep() > fDeepestLevel) fDeepestLevel = lvda.getLevelsDeep(); 
-         
-      }
-      else if (element instanceof BeanElement && !(TypeFactory.recognizedBean(element.getName()))){
-         AttributeVisitor attributeVisitor = new AttributeVisitor();
-         LevelsDeepVisitorAction lvda = new LevelsDeepVisitorAction(fLevelsDeep,false);
-         attributeVisitor.run(element,lvda);
-         if (lvda.getLevelsDeep() > fDeepestLevel) fDeepestLevel = lvda.getLevelsDeep(); 
-   
-         FieldVisitor fieldVisitor = new FieldVisitor();
-         LevelsDeepVisitorAction lvda2 = new LevelsDeepVisitorAction(fLevelsDeep,false);
-         fieldVisitor.run(element,lvda2);
-         if (lvda2.getLevelsDeep() > fDeepestLevel) fDeepestLevel = lvda2.getLevelsDeep(); 
-   
-      }
-         
-     return new SimpleStatus("");   
-  }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/MethodFileGenerator.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/MethodFileGenerator.java
deleted file mode 100644
index 56c6e8e..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/MethodFileGenerator.java
+++ /dev/null
@@ -1,79 +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.consumption.sampleapp.codegen;
-
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.MethodVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.BeanElement;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-
-
-/**
-* Objects of this class represent a MethodFilegenerator.
-* */
-public class MethodFileGenerator extends Generator 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-   
-  public String fInputName;
-  /**
-  * Constructor.
-  * 
-  */
-  public MethodFileGenerator (String inputs)
-  {
-    super();
-    fInputName = inputs;
-  }
-
-   /**
-  * Constructor.
-  * @param StringBuffer buffer to append codegen 
-  */
-  public MethodFileGenerator (StringBuffer buffer,String inputs)
-  {
-    super(buffer);
-    fInputName = inputs;
-  }
-
-
-  public void setFileNames(String inputs)
-  {
-    fInputName = inputs;
-  }
-
-  //public static String LOCATOR = "Locator";
-  public static String BEAN = "Proxy";
-  public static String GET = "get";
-
-  
-  //takes in a bean node
-  public Status visit (Object object)
-   {
-      Element beanElement = (Element)object;
-      BeanElement bean = (BeanElement)beanElement;
-      fbuffer.append("<%@page contentType=\"text/html;charset=UTF-8\"%>");
-      fbuffer.append("<HTML>" + StringUtils.NEWLINE + "<HEAD>" + StringUtils.NEWLINE + "<TITLE>Methods</TITLE>" + StringUtils.NEWLINE + "</HEAD>" + StringUtils.NEWLINE + "<BODY>" + StringUtils.NEWLINE + "<H1>Methods</H1>" + StringUtils.NEWLINE + "<UL>" + StringUtils.NEWLINE);
-      MethodVisitor methodVisitor = new MethodVisitor();
-      MethodFileHelpGenerator methodFileHelpGenerator = new MethodFileHelpGenerator(fbuffer,fInputName); 
-      methodVisitor.run(beanElement,methodFileHelpGenerator);
-      fbuffer = methodFileHelpGenerator.getStringBuffer();
-      fbuffer.append("</UL>" + StringUtils.NEWLINE + "</BODY>" + StringUtils.NEWLINE + "</HTML>");
-      
-      return new SimpleStatus("");
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/MethodFileHelpGenerator.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/MethodFileHelpGenerator.java
deleted file mode 100644
index 3bca23c..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/MethodFileHelpGenerator.java
+++ /dev/null
@@ -1,56 +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.consumption.sampleapp.codegen;
-
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.MethodElement;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-
-
-/**
-* Objects of this class represent a MethodFilegenerator.
-* */
-public class MethodFileHelpGenerator extends MethodFileGenerator
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
-  /**
-  * Constructor.
-  *
-  */
-  public MethodFileHelpGenerator (StringBuffer buffer,String inputName)
-  {
-      super(buffer,inputName);
-  }
-
-
-  //takes in a Method node
-  public Status visit (Object object)
-  {
-      Element methodElement = (Element)object;
-      MethodElement method = (MethodElement)methodElement;
-      if (method.getMethodOmmission()) return new SimpleStatus("");
-      
-      fbuffer.append("<LI><A HREF=\"" + fInputName + "?method=" + method.getNumberID());
-      fbuffer.append("\" TARGET=\"inputs\"> " + method.getDisplayName());
-      fbuffer.append("</A></LI>" + StringUtils.NEWLINE);
-
-      return new SimpleStatus("");
-  }
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileAttributeGenerator.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileAttributeGenerator.java
deleted file mode 100644
index b6099dd..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileAttributeGenerator.java
+++ /dev/null
@@ -1,90 +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.consumption.sampleapp.codegen;
-
-import java.util.Vector;
-
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.TypeVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.AttributeElementType;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.DataType;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeFactory;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-
-/**
-* Objects of this class represent a ResultFileAttributeGenerator.
-* */
-public class ResultFileAttributeGenerator extends ResultFileHelp2Generator 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-   
-  private Vector fSetterVector; 
-
-  /**
-  * Constructor.
-  * @param buffer StringBuffer object that this code generator writes to 
-  */
-  public ResultFileAttributeGenerator (StringBuffer buffer)
-  {
-      super(buffer);
-      
-  }
-  
-  /**
-  * Setter vector
-  */
-  public Vector getSetterVector()
-  {
-      return fSetterVector;
-  }
-  
-
-  /**
-  * Visit Method generates code for this Visitor
-  * @param Parameter parameter code will be generated 
-  */
-  public Status visit (Object object)
-  {
-     AttributeElementType attributeElementType = (AttributeElementType)object;
-     BasicElement element = (BasicElement)object;
-     if(attributeElementType.getTypeElement().isSimple() || TypeFactory.recognizedBean(attributeElementType.getTypeElement().getName())){      
-        //start the codegen
-        //ask the datatype for its request line, it may need mark up or not.
-        //ie For the simple types we need the mark up
-        //for the dom element we cant use it.
-        DataType dataType = TypeFactory.createType(attributeElementType.getTypeElement().getName(),element.getMUID());
-        setTypeOwnerId(idName(element.getName())); 
-        fbuffer.append(dataType.getRequestCode(element.getMUID(),getTypeOwnerId()));
-                
-     }
-     
-     TypeVisitor typeVisitor = new TypeVisitor();
-     ResultFileTypeGenerator resultFileTypeGenerator = new ResultFileTypeGenerator(fbuffer);
-     resultFileTypeGenerator.setNumberFactory(getNumberFactory());
-     resultFileTypeGenerator.setTypeOwnerId(getTypeOwnerId());
-     
-     typeVisitor.run(attributeElementType,resultFileTypeGenerator);
-     setNumberFactory(resultFileTypeGenerator.getNumberFactory());
-     Vector setterInputs = resultFileTypeGenerator.getResidentVector(); 
-     if(attributeElementType.getSetterMethod() == null) return new SimpleStatus(""); 
-     putResidentVector(attributeElementType.getSetterSignature((String)setterInputs.firstElement()));
-     
-     return new SimpleStatus("");
-  }   
-
-  
-  
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileGenerator.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileGenerator.java
deleted file mode 100644
index 3ff4a3b..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileGenerator.java
+++ /dev/null
@@ -1,139 +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.consumption.sampleapp.codegen;
-
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.MethodVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.BeanElement;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-
-
-/**
-* Objects of this class represent a MethodFilegenerator.
-* */
-public class ResultFileGenerator extends Generator 
-{
-  public static String TRIPLE_TAB = Generator.DOUBLE_TAB + Generator.TAB; 
-  public static String QUAD_TAB = Generator.DOUBLE_TAB + Generator.DOUBLE_TAB;
-  
-  private String setEndpointMethod;
-
-  /**
-  * Constructor.
-  * 
-  */
-  public ResultFileGenerator ()
-  {
-      super();
-  }
-
-   /**
-  * Constructor.
-  * 
-  */
-  public ResultFileGenerator (StringBuffer buffer)
-  {
-      super(buffer);
-  }
-
-  //takes in a bean node
-  public Status visit (Object object)
-  {
-      Element beanElement = (Element)object;
-      BeanElement bean = (BeanElement)beanElement;
-      fbuffer.append("<%@page contentType=\"text/html;charset=UTF-8\"%>");
-      fbuffer.append("<HTML>" + StringUtils.NEWLINE);
-      fbuffer.append("<HEAD>" + StringUtils.NEWLINE);
-      fbuffer.append("<TITLE>Result</TITLE>" + StringUtils.NEWLINE);
-      fbuffer.append("</HEAD>" + StringUtils.NEWLINE);
-      fbuffer.append("<BODY>" + StringUtils.NEWLINE);
-      fbuffer.append("<H1>Result</H1>" + StringUtils.NEWLINE + StringUtils.NEWLINE);
-
-      fbuffer.append("<jsp:useBean id=\""+ getSessionBeanId() + "\" scope=\"session\" class=\"");
-      fbuffer.append(bean.getName() + "\" />" + StringUtils.NEWLINE);
-      if (setEndpointMethod != null && setEndpointMethod.length() > 0)
-      {
-        fbuffer.append("<%");
-        fbuffer.append(StringUtils.NEWLINE);
-        fbuffer.append("if (request.getParameter(\"endpoint\") != null && request.getParameter(\"endpoint\").length() > 0)");
-        fbuffer.append(StringUtils.NEWLINE);
-        fbuffer.append(getSessionBeanId());
-        fbuffer.append(".");
-        int index = setEndpointMethod.indexOf('?');
-        if (index != -1)
-        {
-          fbuffer.append(setEndpointMethod.substring(0, index));
-          fbuffer.append("(new ");
-          fbuffer.append(setEndpointMethod.substring(index+1, setEndpointMethod.length()));
-          fbuffer.append("(request.getParameter(\"endpoint\")));");
-        }
-        else
-        {
-          fbuffer.append(setEndpointMethod);
-          fbuffer.append("(request.getParameter(\"endpoint\"));");
-        }
-        fbuffer.append(StringUtils.NEWLINE);
-        fbuffer.append("%>");
-        fbuffer.append(StringUtils.NEWLINE);
-      }
-      fbuffer.append(StringUtils.NEWLINE); 
-            
-      //carry on with regular gorp
-      fbuffer.append("<%" + StringUtils.NEWLINE);
-      fbuffer.append("String method = request.getParameter(\"method\");" + StringUtils.NEWLINE);
-      fbuffer.append("int methodID = 0;" + StringUtils.NEWLINE);
-      fbuffer.append("if (method == null) methodID = -1;" + StringUtils.NEWLINE + "" + StringUtils.NEWLINE);
-      fbuffer.append("if(methodID != -1) methodID = Integer.parseInt(method);" + StringUtils.NEWLINE); 
-      fbuffer.append("boolean gotMethod = false;" + StringUtils.NEWLINE + StringUtils.NEWLINE);
-
-      fbuffer.append("try {" + StringUtils.NEWLINE);
-      fbuffer.append("switch (methodID){ " + StringUtils.NEWLINE);
-    
-      // go to the next generator
-      MethodVisitor methodVisitor = new MethodVisitor();
-      ResultFileHelp1Generator resultFileHelp1Generator = new ResultFileHelp1Generator(fbuffer); 
-      resultFileHelp1Generator.setNumberFactory(getNumberFactory());
-      resultFileHelp1Generator.setClientFolderPath(getClientFolderPath());
-      methodVisitor.run(beanElement,resultFileHelp1Generator);
-      setNumberFactory(resultFileHelp1Generator.getNumberFactory());
-
-      fbuffer = resultFileHelp1Generator.getStringBuffer();
- 
-      fbuffer.append("}" + StringUtils.NEWLINE);    
-      fbuffer.append("} catch (Exception e) { " + StringUtils.NEWLINE);
-      fbuffer.append("%>" + StringUtils.NEWLINE);
-      fbuffer.append("exception: <%= e %>" + StringUtils.NEWLINE);
-      fbuffer.append("<%" + StringUtils.NEWLINE);
-      fbuffer.append("return;" + StringUtils.NEWLINE);
-      fbuffer.append("}" + StringUtils.NEWLINE);
-      fbuffer.append("if(!gotMethod){" + StringUtils.NEWLINE);
-      fbuffer.append("%>" + StringUtils.NEWLINE);
-      fbuffer.append("result: N/A" + StringUtils.NEWLINE);
-      fbuffer.append("<%" + StringUtils.NEWLINE);
-      fbuffer.append("}" + StringUtils.NEWLINE);
-      fbuffer.append("%>" + StringUtils.NEWLINE);
-      fbuffer.append("</BODY>" + StringUtils.NEWLINE);
-      fbuffer.append("</HTML>");
-
-      return new SimpleStatus("");
-    }
-
-  /**
-   * @param setEndpointMethod The setEndpointMethod to set.
-   */
-  public void setSetEndpointMethod(String setEndpointMethod)
-  {
-    this.setEndpointMethod = setEndpointMethod;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileHelp1Generator.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileHelp1Generator.java
deleted file mode 100644
index 1063a19..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileHelp1Generator.java
+++ /dev/null
@@ -1,158 +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.consumption.sampleapp.codegen;
-
-import java.util.Enumeration;
-
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.ParameterVisitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.ReturnParameterVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.DataType;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.MethodElement;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeFactory;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-
-
-/**
-* Objects of this class represent a ResultFilegenerator.
-* */
-public class ResultFileHelp1Generator extends ResultFileGenerator 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-   
-  public static final int INITIAL_STATE = 1;
-  public static final int FINAL_STATE = 2;
-  public static final String MTEMP = "mtemp";
-  public static String BEAN = "Proxy";
-
-  /**
-  * keeps the state of the visitor 
-  * */
-
-  private int fstate;
-
-  
-  /**
-  * Constructor.
-  * @param buffer StringBuffer object that this code generator writes to 
-  */
-  public ResultFileHelp1Generator (StringBuffer buffer)
-  {
-      super(buffer);
-      fstate = INITIAL_STATE;
-    
-  }
-  
-  /**
-  * Visit Method generates code for this Visitor
-  * @param method method code will be generated for 
-  */
-  public Status visit (Object object)
-  {
-     Element methodElement = (Element)object;
-  
-
-     MethodElement method = (MethodElement)methodElement;
-     if (method.getMethodOmmission()) return new SimpleStatus("");
-
-     fbuffer.append("case " + method.getNumberID()+ ":" + StringUtils.NEWLINE);
-     visitHelper(method);
-     
-     fbuffer.append("break;" + StringUtils.NEWLINE); 
-  
-     return new SimpleStatus("");
-  }   
-  /**
-  * Helps out the visitor
-  * @param method method code will be generated for 
-  */
-  public void visitHelper (Element methodElement)
-  {
-
-     fbuffer.append(Generator.DOUBLE_TAB + "gotMethod = true;" + StringUtils.NEWLINE);
-     
-     MethodElement method = (MethodElement)methodElement;
-     // go to the next generator
-     ResultFileHelp2Generator resultFileHelp2Generator = new ResultFileHelp2Generator(fbuffer); 
-     resultFileHelp2Generator.setNumberFactory(getNumberFactory());
-     ParameterVisitor parameterVisitor = new ParameterVisitor();
-     parameterVisitor.run(methodElement,resultFileHelp2Generator);
-     fbuffer = resultFileHelp2Generator.getStringBuffer();
-     setNumberFactory(resultFileHelp2Generator.getNumberFactory());
-     // we must now grab the state data from the resident vector
-     setResidentVector(resultFileHelp2Generator.getResidentVector());
-
-     
-     //there is no return type if void occurs    
-    
-     
-     if (method.getReturnParameterElement().getTypeElement().getName().equals("void"))
-        fbuffer.append(Generator.DOUBLE_TAB + getSessionBeanId() + "." +method.getName() + "(");
-
-     else{
-        fbuffer.append(Generator.DOUBLE_TAB + method.getReturnParameterElement().getTypeElement().getName() + Generator.SPACE + method.getMUID() + MTEMP + Generator.SPACE);
-        fbuffer.append("=" + Generator.SPACE + getSessionBeanId() + "." + method.getName() + "(");
-     }
-
-     Enumeration e = fResidentVector.elements();
-     while (e.hasMoreElements()){
-          fbuffer.append((String)e.nextElement());
-          if (e.hasMoreElements())
-              fbuffer.append(",");    
-     }
-     fbuffer.append(");" + StringUtils.NEWLINE);
-     if (!method.getReturnParameterElement().getTypeElement().getName().equals("void") && !method.getReturnParameterElement().getTypeElement().isPrimitive()){
-        //in case our result is null
-        fbuffer.append("if(" + method.getMUID() + "mtemp == null){" + StringUtils.NEWLINE);
-        fbuffer.append("%>" + StringUtils.NEWLINE);
-        fbuffer.append("<%=" + method.getMUID() + "mtemp %>" + StringUtils.NEWLINE);
-        fbuffer.append("<%" + StringUtils.NEWLINE);
-        fbuffer.append("}else{" + StringUtils.NEWLINE);
-     }
-     
-     //now lets display the return bean
-     // if it is simple we dont need to use the generator
-     
-     if (!method.getReturnParameterElement().getTypeElement().getName().equals("void")){
-        if (method.getReturnParameterElement().getTypeElement().isSimple() 
-           || TypeFactory.recognizedBean(method.getReturnParameterElement().getTypeElement().getName())
-           || TypeFactory.isStateLessBean(method.getReturnParameterElement().getTypeElement().getTypeName())
-           || TypeFactory.isRecognizedReturnType(method.getReturnParameterElement().getTypeElement().getTypeName())){
-           DataType dataType = TypeFactory.createType(method.getReturnParameterElement().getTypeElement().getTypeName(),method.getReturnParameterElement().getMUID());
-           fbuffer.append(dataType.TypeConversion(method.getMUID() + MTEMP));
-        }
-        else{
-           fbuffer.append("%>" + StringUtils.NEWLINE);
-           InputFileHelp2Generator inputFileHelp2Generator = new InputFileHelp2Generator(fbuffer);
-           inputFileHelp2Generator.setInstanceName(method.getMUID() + MTEMP);
-           inputFileHelp2Generator.setReturnParam(true);
-           ReturnParameterVisitor returnParameterVisitor = new ReturnParameterVisitor();
-           returnParameterVisitor.run(method,inputFileHelp2Generator);
-           fbuffer = inputFileHelp2Generator.getStringBuffer();
-           fbuffer.append("<%" + StringUtils.NEWLINE);
-
-        }
-     }
-
-    if (!method.getReturnParameterElement().getTypeElement().getName().equals("void")  && !method.getReturnParameterElement().getTypeElement().isPrimitive()) fbuffer.append("}" + StringUtils.NEWLINE);    
-    
-  }
-
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileHelp2Generator.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileHelp2Generator.java
deleted file mode 100644
index 9f4fe85..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileHelp2Generator.java
+++ /dev/null
@@ -1,101 +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.consumption.sampleapp.codegen;
-
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.TypeVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.DataType;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.ParameterElement;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeFactory;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-
-/**
-* Objects of this class represent a ResultFileHelp2generator.
-* */
-public class ResultFileHelp2Generator extends Generator 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-   
-  private String fTypeOwnerId;  
-
-
-  /**
-  * Constructor.
-  * @param buffer StringBuffer object that this code generator writes to 
-  */
-  public ResultFileHelp2Generator (StringBuffer buffer)
-  {
-      super(buffer);
-      
-  }
-  
-  /**
-  * Visit Method generates code for this Visitor
-  * @param Parameter parameter code will be generated 
-  */
-  public Status visit (Object object)
-  {
-    
-
-     ParameterElement parameterElement = (ParameterElement)object;
-     Element element= parameterElement.getTypeElement(); 
-     if(parameterElement.getTypeElement().isSimple() || TypeFactory.recognizedBean(parameterElement.getTypeElement().getName())){      
-        //start the codegen
-         //ask the datatype for its request line, it may need mark up or not.
-        //ie For the simple types we need the mark up
-        //for the dom element we cant use it.
-        DataType dataType = TypeFactory.createType(parameterElement.getTypeElement().getName(),parameterElement.getMUID());
-        setTypeOwnerId(idName(parameterElement.getName()));
-        fbuffer.append(dataType.getRequestCode(parameterElement.getMUID(),getTypeOwnerId()));
-     }
-         
-     //visit the type generator
-     ResultFileTypeGenerator resultFileTypeGenerator = new ResultFileTypeGenerator(fbuffer); 
-     resultFileTypeGenerator.setNumberFactory(getNumberFactory());
-     resultFileTypeGenerator.setTypeOwnerId(getTypeOwnerId());
-     TypeVisitor TypeVisitor = new TypeVisitor();
-     TypeVisitor.run(parameterElement,resultFileTypeGenerator);
-     fbuffer = resultFileTypeGenerator.getStringBuffer();
-     setNumberFactory(resultFileTypeGenerator.getNumberFactory());
-     String name = (String)resultFileTypeGenerator.getResidentVector().firstElement();
-     putResidentVector(name); 
-     
-     return new SimpleStatus("");
-  }
-
-
-  public String getTypeOwnerId()
-  {
-     if (fTypeOwnerId == null) fTypeOwnerId = ""; 
-     return fTypeOwnerId;
-  }
-
-  public void setTypeOwnerId(String name)
-  {
-    fTypeOwnerId = name;
-  }
-
-  public String idName(String name)
-  {
-  	
-    String uniqueNum = String.valueOf(getUniqueNumber());
-    String newName = name.replace('.','1') + "_" +uniqueNum + "id";
-    return newName;
-  }
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileTypeGenerator.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileTypeGenerator.java
deleted file mode 100644
index 11bad8c..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileTypeGenerator.java
+++ /dev/null
@@ -1,111 +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.consumption.sampleapp.codegen;
-
-import java.util.Enumeration;
-
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.AttributeVisitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.FieldVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.DataType;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeElement;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeFactory;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-
-/**
-* Objects of this class represent a ResultFileHelp2generator.
-* */
-public class ResultFileTypeGenerator extends ResultFileHelp2Generator 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
-
-  public String fTypeIdName;
- 
-  /**
-  * Constructor.
-  * @param buffer StringBuffer object that this code generator writes to 
-  */
-  public ResultFileTypeGenerator (StringBuffer buffer)
-  {
-      super(buffer);
-  }
-  
-  /**
-  * Visit Method generates code for this Visitor
-  * @param Parameter parameter code will be generated 
-  */
-  public Status visit (Object object)
-  {
-     Element typeElement = (Element)object;
-     TypeElement type = (TypeElement)typeElement;      
-     // right now we only have simple to worry about
-     if(type.isSimple() || TypeFactory.recognizedBean(type.getName())){
-       // create the type that represents the simple type name
-       DataType dataType = TypeFactory.createType(type.getName(),type.getOwningElement().getMUID());
-  
-       String nodeName = getTypeOwnerId()+ "Temp";
-       fbuffer.append(dataType.stringConversion(type.getName(),nodeName,getTypeOwnerId()));
-
-       putResidentVector(nodeName);
-     }
-
-     else {
-       //must be complex
-       String typeName = typeElement.getName(); 
-       fTypeIdName = idName(typeName);
-              
-       AttributeVisitor attributeVisitor = new AttributeVisitor();
-       ResultFileAttributeGenerator resultFileAttributeGenerator = new ResultFileAttributeGenerator(fbuffer);
-       resultFileAttributeGenerator.setNumberFactory(getNumberFactory());
-       attributeVisitor.run(typeElement,resultFileAttributeGenerator);
-       setNumberFactory(resultFileAttributeGenerator.getNumberFactory());
-       fbuffer = resultFileAttributeGenerator.getStringBuffer();
-
-       FieldVisitor fieldVisitor = new FieldVisitor();
-       ResultFileAttributeGenerator resultFileAttributeGenerator2 = new ResultFileAttributeGenerator(fbuffer);
-       resultFileAttributeGenerator2.setNumberFactory(getNumberFactory());
-       fieldVisitor.run(typeElement,resultFileAttributeGenerator2);
-       setNumberFactory(resultFileAttributeGenerator2.getNumberFactory());
-       fbuffer = resultFileAttributeGenerator2.getStringBuffer();
-
-      
-       fbuffer.append(Generator.DOUBLE_TAB + "%>" + StringUtils.NEWLINE);
-       fbuffer.append(Generator.DOUBLE_TAB + "<jsp:useBean id=\"" + fTypeIdName + "\" scope=\"session\" class=\"" + typeName + "\" />" + StringUtils.NEWLINE);
-       fbuffer.append(Generator.DOUBLE_TAB + "<%" + StringUtils.NEWLINE);
-         
-       Enumeration e = resultFileAttributeGenerator.getResidentVector().elements();
-       while(e.hasMoreElements()){
-          fbuffer.append(Generator.DOUBLE_TAB + fTypeIdName + "." + e.nextElement() + StringUtils.NEWLINE);
-       }
-
-       Enumeration e2 = resultFileAttributeGenerator2.getResidentVector().elements();
-       while(e2.hasMoreElements()){
-          fbuffer.append(Generator.DOUBLE_TAB + fTypeIdName + "." + e2.nextElement() + StringUtils.NEWLINE);
-       } 
-       putResidentVector(fTypeIdName);
-       //end of changes
-     
-    }
-     
-     return new SimpleStatus("");
-  }   
-  
-
-  
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/TestClientFileGenerator.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/TestClientFileGenerator.java
deleted file mode 100644
index 92fb88f..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/TestClientFileGenerator.java
+++ /dev/null
@@ -1,91 +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.consumption.sampleapp.codegen;
-
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-
-
-/**
-* Objects of this class represent a TestClientFilegenerator.
-* */
-public class TestClientFileGenerator extends Generator
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
-  public String fMethodName;
-  public String fInputName;
-  public String fResultName;
-  
-  /**
-  * Constructor.
-  *
-  */
-  public TestClientFileGenerator (String inputs, String methods, String results)
-  {
-     super();
-     fInputName = inputs;
-     fMethodName = methods;
-     fResultName = results;
-  }
-
-  public void setFileNames(String inputs, String methods, String results)
-  {
-    fInputName = inputs;
-    fMethodName = methods;
-    fResultName = results;
-  }
-
-  //takes in a bean node
-   public Status visit (Object object)
-   {
-      Element beanElement = (Element)object;
-      
-      fbuffer.append("<%@page contentType=\"text/html;charset=UTF-8\"%>");
-      fbuffer.append("<HTML>" + StringUtils.NEWLINE);
-      fbuffer.append("<HEAD>" + StringUtils.NEWLINE);
-      fbuffer.append("<TITLE>Web Services Test Client</TITLE>" + StringUtils.NEWLINE);
-      fbuffer.append("</HEAD>" + StringUtils.NEWLINE + "");
-      fbuffer.append("<FRAMESET  COLS=\"220,*\">" + StringUtils.NEWLINE);
-      fbuffer.append("<FRAME SRC=\""+ fMethodName + "\" NAME=\"methods\" MARGINWIDTH=\"1\" MARGINHEIGHT=\"1\" SCROLLING=\"yes\" FRAMEBORDER=\"1\">" + StringUtils.NEWLINE);
-      fbuffer.append("<FRAMESET  ROWS=\"80%,20%\">" + StringUtils.NEWLINE);
-      fbuffer.append("<FRAME SRC=\""+ fInputName  + "\" NAME=\"inputs\"  MARGINWIDTH=\"1\" MARGINHEIGHT=\"1\" SCROLLING=\"yes\" FRAMEBORDER=\"1\">" + StringUtils.NEWLINE);
-      fbuffer.append("<%").append(StringUtils.NEWLINE);
-      fbuffer.append("StringBuffer resultJSP = new StringBuffer(\"").append(fResultName).append("\");").append(StringUtils.NEWLINE);
-      fbuffer.append("resultJSP.append(\"?\");").append(StringUtils.NEWLINE);
-      fbuffer.append("java.util.Enumeration resultEnum = request.getParameterNames();");
-      fbuffer.append("while (resultEnum.hasMoreElements()) {").append(StringUtils.NEWLINE);
-      fbuffer.append("Object resultObj = resultEnum.nextElement();").append(StringUtils.NEWLINE);
-      fbuffer.append("resultJSP.append(resultObj.toString()).append(\"=\").append(request.getParameter(resultObj.toString())).append(\"&\");").append(StringUtils.NEWLINE);
-      fbuffer.append("}").append(StringUtils.NEWLINE);
-      fbuffer.append("%>").append(StringUtils.NEWLINE);
-      fbuffer.append("<FRAME SRC=\"<%=resultJSP.toString()%>\" NAME=\"result\"  MARGINWIDTH=\"1\" MARGINHEIGHT=\"1\" SCROLLING=\"yes\" FRAMEBORDER=\"1\">" + StringUtils.NEWLINE);
-      fbuffer.append("</FRAMESET>" + StringUtils.NEWLINE);
-
-
-      fbuffer.append("<NOFRAMES>" + StringUtils.NEWLINE);
-      fbuffer.append("<BODY>" + StringUtils.NEWLINE);
-      fbuffer.append("The Web Services Test Client requires a browser that supports frames." + StringUtils.NEWLINE);
-      fbuffer.append("</BODY>" + StringUtils.NEWLINE);
-      fbuffer.append("</NOFRAMES>" + StringUtils.NEWLINE);
-      fbuffer.append("</FRAMESET>" + StringUtils.NEWLINE);
-      fbuffer.append("</HTML>");
-
-      return new SimpleStatus("");
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/command/GeneratePageCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/command/GeneratePageCommand.java
deleted file mode 100644
index 123b570..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/command/GeneratePageCommand.java
+++ /dev/null
@@ -1,115 +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.consumption.sampleapp.command;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-import org.eclipse.wst.command.env.common.FileResourceUtils;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.command.env.core.context.ResourceContext;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-
-
-/**
- * MofToBeanModelCommand
- * Creation date: (4/10/2001 12:41:48 PM)
- * @author: Gilbert Andrews
- */
-public class GeneratePageCommand extends SimpleCommand {
-		
-private String LABEL = "GeneratePageCommand";
-private String DESCRIPTION = "Generate code based on the model";
-private MessageUtils msgUtils_;
-
-private Model model_;
-private Generator fGenerator;
-private IFile fIFile;
-private ResourceContext resourceContext_;
-private StringBuffer fStringBuffer;
-
-private Element rootElement_;
-/**
- * Build constructor comment.
- */
-public GeneratePageCommand()
-{
-	String pluginId = "org.eclipse.jst.ws.consumption";
-	msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-	setDescription(DESCRIPTION);
-	setName(LABEL);  		
-}
-
-/**
-* Constructor
-* This command will generate code from a Model
-* @param model The model to be traversed
-* @param generator The code generator to be used
-* @param resource the resource to place the finished product
-*/
-public GeneratePageCommand(ResourceContext context, Model model, Generator generator, IFile file)
-{
-  String pluginId = "org.eclipse.jst.ws.consumption";
-  msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-  setDescription(DESCRIPTION);
-  setName(LABEL);	
-  
-  model_ = model;
-  fGenerator = generator;
-  fIFile = file;
-  resourceContext_ = context;
-}
-
-public Model getDataModel()
-{
-  return model_;
-}
-
-/**
- *
- */
-public Status execute(Environment env)
-{
-  Status status = new SimpleStatus( "" );
-  try {
-    fGenerator.visit(model_.getRootElement());
-    fStringBuffer = fGenerator.getStringBuffer();
-    String tempString = fStringBuffer.toString();
-    OutputStream fileResource = FileResourceUtils.newFileOutputStream(resourceContext_, fIFile.getFullPath(), env.getProgressMonitor(), env.getStatusHandler());
-    //PrintStream ps = new PrintStream(fileResource);
-    //ps.print(tempString);
-    OutputStreamWriter osw = new OutputStreamWriter(fileResource,"UTF-8");
-    osw.write(tempString,0,fStringBuffer.length());  
-    osw.close();
-    fileResource.close();
-    return status;
-  } catch (IOException ioexc) {
-  	status = new SimpleStatus("", ioexc.getMessage(), Status.ERROR);
-  	return status;
-  }
-}
-
-public void setRootElement(Element rootElement)
-{
-  rootElement_ = rootElement;
-}
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/command/JavaToModelCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/command/JavaToModelCommand.java
deleted file mode 100644
index 03b7017..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/command/JavaToModelCommand.java
+++ /dev/null
@@ -1,239 +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.consumption.sampleapp.command;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.ws.internal.common.EnvironmentUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitoractions.JavaMofBeanVisitorAction;
-import org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors.JavaMofBeanVisitor;
-import org.eclipse.jst.ws.internal.consumption.command.common.JavaMofReflectionCommand;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Choice;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.command.env.core.selection.BooleanSelection;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-
-/**
-* This is the base class for commands that need to report progress
-* and status during and after their execution. This class extends
-* {@link org.eclipse.emf.common.command.AbstractCommand AbstractCommand}
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-* with methods to {@link #setProgressMonitor set}
-* and {@link #getProgressMonitor get} a progress monitor,
-* and to get a status object {@link #getReadyStatus before}
-* or {@link #getResultStatus after} execution.
-* <p>
-* Note that the responsibility of providing an
-* {@link org.eclipse.core.runtime.IProgressMonitor IProgressMonitor}
-* rests with frameworks that construct or run ProgressCommand objects,
-* whereas the responsibility of providing an
-* {@link org.eclipse.core.runtime.IStatus IStatus}
-* object lies with the subclasses of ProgressCommand.
-* Subclasses must follow the rules described for
-* {@link org.eclipse.emf.common.command.AbstractCommand AbstractCommand}.
-*/
-public class JavaToModelCommand extends SimpleCommand
-{
-  private MessageUtils msgUtils;
-  private IResource resource;
-  private String clientProject;
-  private BooleanSelection[] methods;
-  private String proxyBean;
-  private JavaClass javaClass;
-  private Model model;
-  private Element parentElement;
-  private IProject project;
-  
-  public static String LABEL = "JavaToModelCommand";
-  public static String DESCRIPTION = "this creates a model from a resource";
- 
-  
-
-  public JavaToModelCommand ()
-  {
-	String pluginId = "org.eclipse.jst.ws.consumption";
-	msgUtils = new MessageUtils(pluginId + ".plugin", this);  	
-  	setDescription(DESCRIPTION);
-  	setName(LABEL);
-  }
-
-  
-  private Status createJavaReflection(Environment env)
-  {
-  	Status status = new SimpleStatus("");
-    JavaMofReflectionCommand javaMofReflectionCommand = new JavaMofReflectionCommand();
-    javaMofReflectionCommand.setClientProject(clientProject);
-    javaMofReflectionCommand.setProxyBean(proxyBean);
-    //javaMofReflectionCommand.setStatusMonitor(getStatusMonitor());
-    status = javaMofReflectionCommand.execute(env);
-    javaClass = (JavaClass)javaMofReflectionCommand.getJavaClass();
-    return status;
-  }
-
-  /**
-  * The Model that was created from this javamof
-  * @return Model The data model that was created
-  **/
-  public Model getDataModel()
-  {
-    return model;
-  }
-
-  /**
-  * Build the datamodel from the mof
-  */
-  public Status buildModelFromMof (Environment env) throws CoreException
-  {
-  	
-  	Choice OKChoice = new Choice('O', msgUtils.getMessage("LABEL_OK"), msgUtils.getMessage("DESCRIPTION_OK"));
-  	Choice CancelChoice = new Choice('C', msgUtils.getMessage("LABEL_CANCEL"), msgUtils.getMessage("DESCRIPTION_CANCEL"));
-  	
-    // we could have one of three cases:
-    //1. The model is null meaning we want and the parent element is null, meaning we want to
-    //   create a brand new model and make this bean its root
-    //2. The model is null but the parentElement is not, meaning we want to add the Bean to the
-    //   given parent element
-    //3. The model is not null however the parentElement is, meaning we want to add this Bean to
-    //   This model but dont attach it to anything
-      Status status = new SimpleStatus("");
-
-      if(model == null && parentElement == null){
-         JavaMofBeanVisitorAction beanVisitorAction = new JavaMofBeanVisitorAction(clientProject,methods, env);
-         //beanVisitorAction.setStatusMonitor(getStatusMonitor());
-	     JavaMofBeanVisitor beanVisitor = new JavaMofBeanVisitor();
-         status = beanVisitor.run(javaClass,beanVisitorAction);
-         //
-         int severity = status.getSeverity(); 
-         if (severity==Status.ERROR)
-         	return status;
-         
-         if (severity==Status.WARNING)
-         {
-           Choice result = env.getStatusHandler().report(status, new Choice[]{OKChoice, CancelChoice});
-           if (result.getLabel().equals(CancelChoice.getLabel()))
-           {
-           	 //return an error status since the user canceled
-           	  return new SimpleStatus("", msgUtils.getMessage("MSG_ERROR_SAMPLE_CREATION_CANCELED"), Status.ERROR);
-           }
-           	
-         }
-         //
-         model = beanVisitorAction.getModel();
-
-      }
-      else if (model == null && parentElement != null){
-         JavaMofBeanVisitorAction beanVisitorAction = new JavaMofBeanVisitorAction(parentElement,clientProject, env);
-         //beanVisitorAction.setStatusMonitor(getStatusMonitor());
-	     JavaMofBeanVisitor beanVisitor = new JavaMofBeanVisitor();
-         status = beanVisitor.run(javaClass,beanVisitorAction);
-         //
-         int severity = status.getSeverity(); 
-         if (severity==Status.ERROR)
-         	return status;
-         
-         if (severity==Status.WARNING)
-         {
-           Choice result = env.getStatusHandler().report(status, new Choice[]{OKChoice, CancelChoice});
-           if (result.getLabel().equals(CancelChoice.getLabel()))
-           {
-           	 //return an error status since the user canceled
-           	  return new SimpleStatus("", msgUtils.getMessage("MSG_ERROR_SAMPLE_CREATION_CANCELED"), Status.ERROR);
-           }
-           	
-         }
-         //         
-         model = beanVisitorAction.getModel();
-      }
-      else {
-         JavaMofBeanVisitorAction beanVisitorAction = new JavaMofBeanVisitorAction(model,clientProject, env);
-         //beanVisitorAction.setStatusMonitor(getStatusMonitor());
-	     JavaMofBeanVisitor beanVisitor = new JavaMofBeanVisitor();
-         status = beanVisitor.run(javaClass,beanVisitorAction);
-         //
-         int severity = status.getSeverity(); 
-         if (severity==Status.ERROR)
-         	return status;
-         
-         if (severity==Status.WARNING)
-         {
-           Choice result = env.getStatusHandler().report(status, new Choice[]{OKChoice, CancelChoice});
-           if (result.getLabel().equals(CancelChoice.getLabel()))
-           {
-           	 //return an error status since the user canceled
-           	  return new SimpleStatus("", msgUtils.getMessage("MSG_ERROR_SAMPLE_CREATION_CANCELED"), Status.ERROR);
-           }
-           	
-         }
-         //         
-         model = beanVisitorAction.getModel();
-      }
-
-      return status;
-  }
-
-  /**
-  * Get the java model from the resource then
-  * build the model from the mof
-  */
-  public Status execute(Environment env)
-  {
-  	Status status = new SimpleStatus("");
-    if(clientProject == null) return status;
-    IProject project = (IProject)ResourceUtils.findResource(clientProject);
-    
-  	status = createJavaReflection(env);
-    if (status.getSeverity()==Status.ERROR) return status;
-    try{
-      status = buildModelFromMof(env);
-      return status;
-    }catch(CoreException exc){
-      IStatus embeddedStatus = exc.getStatus();
-      status = EnvironmentUtils.convertIStatusToStatus(embeddedStatus);
-      return status;
-    }
-
-  }
-    
-  public void setMethods(BooleanSelection[] methods)
-  {
-  	this.methods =  methods;
-  }
-  
-  public void setClientProject(String clientProject)
-  {
-  	this.clientProject = clientProject;
-  }
-  
-  public void setParentElement(Element parentElement)
-  {
-  	this.parentElement = parentElement;
-  }
-     
-  public void setProxyBean(String proxyBean)
-  {
-  	this.proxyBean = proxyBean;
-  }
-
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/common/SamplePropertyDescriptor.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/common/SamplePropertyDescriptor.java
deleted file mode 100644
index 74f4b01..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/common/SamplePropertyDescriptor.java
+++ /dev/null
@@ -1,115 +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.consumption.sampleapp.common;
-
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.Method;
-
-
-/**
-* Objects of this class represent a PropertyDescriptor.
-* */
-public class SamplePropertyDescriptor 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
-  private Method fReadMethod;
-  private Method fWriteMethod;
-  private String fPropertyName;
-  private JavaHelpers fPropertyType; 
-  private boolean fStatic;
-  
-  /*
-  * Constructor
-  **/
-  public SamplePropertyDescriptor(String name)
-  {
-    fPropertyName = name; 
-  }
-
-  /*
-  * set the ReadMethod
-  */
-  public void setReadMethod(Method readMethod)
-  {
-    fReadMethod = readMethod;
-  }
-
-   /*
-  * get the ReadMethod 
-  */
-  public Method getReadMethod()
-  {
-    return fReadMethod;
-  }
-
-  /*
-  * set the writeMethod
-  */
-  public void setWriteMethod(Method writeMethod)
-  {
-    fWriteMethod = writeMethod;
-  }
-
-   /*
-  * get the writeMethod 
-  */
-  public Method getWriteMethod()
-  {
-    return fWriteMethod;
-  }
-
-  /*
-  * set the propertyName
-  */
-  public void setName(String name)
-  {
-    fPropertyName= name;
-  }
-
-   /*
-  * get the propertyName
-  */
-  public String getName()
-  {
-    return fPropertyName;
-  }
-
-  /*
-  * set the PropertyType
-  */
-  public void setPropertyType(JavaHelpers propertyType)
-  {
-    fPropertyType = propertyType;
-  }
-
-   /*
-  * get the PropertyType 
-  */
-  public JavaHelpers getPropertyType()
-  {
-    return fPropertyType;
-  }
-      
-  public boolean isfStatic()
-  {
-  	return fStatic;
-  }
-
-  public void setfStatic(boolean fStatic)
-  {
-    this.fStatic = fStatic;	
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/wsfinder/IWSFinder.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/wsfinder/IWSFinder.java
deleted file mode 100644
index 7ea7ff5..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/wsfinder/IWSFinder.java
+++ /dev/null
@@ -1,28 +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.consumption.wsfinder;
-
-import java.util.List;
-
-public interface IWSFinder
-{
-  public String getID();
-  public void setID(String id);
-
-  public String getName();
-  public void setName(String name);
-
-  public String getDescription();
-  public void setDescription(String desc);
-
-  public List find();
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/wsfinder/LiveWSDLFilter.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/wsfinder/LiveWSDLFilter.java
deleted file mode 100644
index 71ae493..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/wsfinder/LiveWSDLFilter.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.consumption.wsfinder;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Port;
-import javax.wsdl.Service;
-import javax.wsdl.WSDLException;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.http.HTTPAddress;
-import javax.wsdl.extensions.soap.SOAPAddress;
-
-import org.eclipse.wst.ws.parser.discovery.WebServicesParserExt;
-import org.eclipse.wst.ws.parser.wsil.WWWAuthenticationException;
-
-public class LiveWSDLFilter extends Thread
-{
-  private String wsdlURL_;
-  private boolean finish_;
-  private boolean live_;
-
-  public LiveWSDLFilter(String wsdlURL)
-  {
-    wsdlURL_ = wsdlURL;
-    finish_ = false;
-    live_ = false;
-  }
-
-  public String getWSDLURL()
-  {
-    return wsdlURL_;
-  }
-
-  public boolean isFinish()
-  {
-    return finish_;
-  }
-
-  public boolean isWSDLLive()
-  {
-    return live_;
-  }
-
-  public void run()
-  {
-    try
-    {
-      live_ = validateWSDL();
-    }
-    catch (Throwable t)
-    {
-      live_ = false;
-    }
-    finally
-    {
-      finish_ = true;
-    }
-  }
-
-  private boolean validateWSDL() throws WSDLException, MalformedURLException, IOException, WWWAuthenticationException
-  {
-  	WebServicesParserExt parser = new WebServicesParserExt();
-  	Definition definition = parser.getWSDLDefinitionVerbose(wsdlURL_);
-    Map services = definition.getServices();
-    Iterator serviceIterator = services.values().iterator();
-    while (serviceIterator.hasNext())
-    {
-      Service service = (Service)serviceIterator.next();
-      Map ports = service.getPorts();
-      Iterator portIterator = ports.values().iterator();
-      while (portIterator.hasNext())
-      {
-        Port port = (Port)portIterator.next();
-        List extensibilityElements = port.getExtensibilityElements();
-        Iterator extensibilityElementsIterator = extensibilityElements.iterator();
-        while (extensibilityElementsIterator.hasNext())
-        {
-          ExtensibilityElement extensibilityElement = (ExtensibilityElement)extensibilityElementsIterator.next();
-          if ((extensibilityElement instanceof SOAPAddress) || (extensibilityElement instanceof HTTPAddress))
-            return true;
-        }
-      }
-    }
-    return false;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/wsfinder/WSFinderCommon.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/wsfinder/WSFinderCommon.java
deleted file mode 100644
index 4cc1cc8..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/wsfinder/WSFinderCommon.java
+++ /dev/null
@@ -1,116 +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.consumption.wsfinder;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectNature;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jst.j2ee.internal.ejb.project.EJBNatureRuntime;
-import org.eclipse.jst.j2ee.internal.project.IEJBNatureConstants;
-import org.eclipse.jst.j2ee.internal.project.IWebNatureConstants;
-import org.eclipse.jst.j2ee.internal.web.operations.J2EEWebNatureRuntime;
-
-public abstract class WSFinderCommon implements IWSFinder
-{
-  private String id_;
-  private String name_;
-  private String desc_;
-
-  public WSFinderCommon()
-  {
-    id_ = null;
-    name_ = null;
-    desc_ = null;
-  }
-
-  public String getID()
-  {
-    return id_;
-  }
-
-  public void setID(String id)
-  {
-    id_ = id;
-  }
-
-  public String getName()
-  {
-    return name_;
-  }
-
-  public void setName(String name)
-  {
-    name_ = name;
-  }
-
-  public String getDescription()
-  {
-    return desc_;
-  }
-
-  public void setDescription(String desc)
-  {
-    desc_ = desc;
-  }
-
-  protected IProject[] getWorkspaceProjects()
-  {
-    IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-    return root.getProjects();
-  }
-
-  protected J2EEWebNatureRuntime getWebNature(IProject project)
-  {
-    try
-    {
-      IProjectNature nature = project.getNature(IWebNatureConstants.J2EE_NATURE_ID);
-      if (nature != null && nature instanceof J2EEWebNatureRuntime)
-        return (J2EEWebNatureRuntime)nature;
-    }
-    catch (CoreException ce)
-    {
-    }
-    return null;
-  }
-
-  protected EJBNatureRuntime getEJBNature(IProject project)
-  {
-    try
-    {
-      IProjectNature nature = project.getNature(IEJBNatureConstants.NATURE_ID);
-      if (nature != null && nature instanceof EJBNatureRuntime)
-        return (EJBNatureRuntime)nature;
-    }
-    catch (CoreException ce)
-    {
-    }
-    return null;
-  }
-
-  protected IFolder getFolderRootPublishable(J2EEWebNatureRuntime webNature)
-  {
-    return (IFolder)webNature.getRootPublishableFolder();
-  }
-
-  protected IFolder getFolderWEBINF(J2EEWebNatureRuntime webNature)
-  {
-    return webNature.getProject().getFolder(webNature.getWEBINFPath().toString());
-  }
-
-  protected IFolder getFolderMETAINF(EJBNatureRuntime ejbNature)
-  {
-    return ejbNature.getMetaFolder();
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/wsfinder/WSFinderRegistry.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/wsfinder/WSFinderRegistry.java
deleted file mode 100644
index 04d7c92..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/wsfinder/WSFinderRegistry.java
+++ /dev/null
@@ -1,87 +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.consumption.wsfinder;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-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 WSFinderRegistry
-{
-  private static WSFinderRegistry instance_;
-  private Vector wsfinders_;
-
-  private WSFinderRegistry()
-  {
-    wsfinders_ = new Vector();
-  }
-  
-  /**
-  * Returns a singleton instance of this class.
-  * @return A singleton WSFinderRegistry object.
-  */
-  public static WSFinderRegistry getInstance()
-  {
-    if (instance_ == null)
-    {
-      instance_ = new WSFinderRegistry();
-      instance_.init();
-    }
-    return instance_;
-  }
-  
-  private void init()
-  {
-    IExtensionRegistry pluginReg = Platform.getExtensionRegistry();
-    IConfigurationElement[] configElements = pluginReg.getConfigurationElementsFor("org.eclipse.jst.ws.consumption", "wsfinder");
-    for (int i = 0; i < configElements.length; i++)
-    {
-      try
-      {
-        Object object = configElements[i].createExecutableExtension("class");
-        if (object instanceof IWSFinder)
-        {
-          IWSFinder wsfinder = (IWSFinder)object;
-          wsfinder.setID(configElements[i].getAttribute("id"));
-          wsfinder.setName(configElements[i].getAttribute("name"));
-          wsfinder.setDescription(configElements[i].getAttribute("description"));
-          wsfinders_.add(wsfinder);
-        }
-      }
-      catch (CoreException ce)
-      {
-      }
-    }
-  }
-
-  public List getWSFinders()
-  {
-    return wsfinders_;
-  }
-  
-  public List getWebServices()
-  {
-    List ws = new Vector();
-    List wsFinders = getWSFinders();
-    for (Iterator it = wsFinders.iterator(); it.hasNext();)
-    {
-      IWSFinder wsFinder = (IWSFinder)it.next();
-      ws.addAll(wsFinder.find());
-    }
-    return ws;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/webserviceutils/org/eclipse/jst/ws/util/DomElementHelper.java b/bundles/org.eclipse.jst.ws.consumption/webserviceutils/org/eclipse/jst/ws/util/DomElementHelper.java
deleted file mode 100644
index 641cdf6..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/webserviceutils/org/eclipse/jst/ws/util/DomElementHelper.java
+++ /dev/null
@@ -1,137 +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.util;
-
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.DocumentBuilder;
-import org.w3c.dom.Document;
-
-/**
- * @author gilberta
- *
- * To change the template for this generated type comment go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-public class DomElementHelper {
-
-
-  public static org.w3c.dom.Element createDomElementFromXMLString(java.lang.String xmlString )
-  {
-    java.io.StringReader stringReader = new java.io.StringReader(xmlString); 
-    org.xml.sax.InputSource inputSource = new org.xml.sax.InputSource(stringReader); 
-    try
-    {
-      DocumentBuilderFactory docBuilderFactory = DocumentBuilderFactory.newInstance();
-      DocumentBuilder docBuilder = docBuilderFactory.newDocumentBuilder();
-      Document document = docBuilder.parse(inputSource);
-      return document.getDocumentElement();
-    }
-    catch (Throwable t)
-    {
-      return null;
-    }
-  }
-
-  public static java.lang.String domWriter(org.w3c.dom.Node node,java.lang.StringBuffer buffer)
-  {
-    if ( node == null ) {
-      return "";
-    }
-	int type = node.getNodeType();
-	switch ( type ) {
-	  case org.w3c.dom.Node.DOCUMENT_NODE: {
-	  buffer.append(JspUtils.markup("<?xml version=\"1.0\" encoding=\"UTF-8\"?>") + "<br>");
-	  domWriter(((org.w3c.dom.Document)node).getDocumentElement(),buffer);
-	  break;
-	}
-	  case org.w3c.dom.Node.ELEMENT_NODE: {
-	  buffer.append(JspUtils.markup("<" + node.getNodeName()));
-	  org.w3c.dom.Attr attrs[] = sortAttributes(node.getAttributes());
-	  for ( int i = 0; i < attrs.length; i++ ) {
-	    org.w3c.dom.Attr attr = attrs[i];
-	    buffer.append(" " + attr.getNodeName() + "=\"" + JspUtils.markup(attr.getNodeValue()) + "\"");
-	  }
-	    buffer.append(JspUtils.markup(">"));
-	    org.w3c.dom.NodeList children = node.getChildNodes();
-	    if ( children != null ) {
-	      int len = children.getLength();
-		  for ( int i = 0; i < len; i++ ) {
-		    if(((org.w3c.dom.Node)children.item(i)).getNodeType() == org.w3c.dom.Node.ELEMENT_NODE)
-			  buffer.append("<br>");
-			domWriter(children.item(i),buffer);
-		  }
-		}
-		buffer.append(JspUtils.markup("</" + node.getNodeName() + ">"));
-		break;
-      }
-	  case org.w3c.dom.Node.ENTITY_REFERENCE_NODE: {
-	    org.w3c.dom.NodeList children = node.getChildNodes();
-	    if ( children != null ) {
-		  int len = children.getLength();
-		  for ( int i = 0; i < len; i++ )
-	      {
-		    buffer.append(children.item(i));
-		  }
-		}
-		break;
-	  }
-	  case org.w3c.dom.Node.CDATA_SECTION_NODE: {
-	    buffer.append(JspUtils.markup(node.getNodeValue()));
-	    break;
-      }
-	  case org.w3c.dom.Node.TEXT_NODE:{
-	    buffer.append(JspUtils.markup(node.getNodeValue()));
-	    break;
-	  }
-	  case org.w3c.dom.Node.PROCESSING_INSTRUCTION_NODE:{
-		buffer.append(JspUtils.markup("<?"));
-		buffer.append(node.getNodeName());
-		String data = node.getNodeValue();
-		if ( data != null && data.length() > 0 ){
-	      buffer.append(" ");
-		  buffer.append(data);
-		}
-		buffer.append(JspUtils.markup("?>"));
-		  break;
-		}
-	  }
-	  return buffer.toString();
-    }
- 
-	public static org.w3c.dom.Attr[] sortAttributes(org.w3c.dom.NamedNodeMap attrs)
-	{
-	  int len = (attrs != null) ? attrs.getLength() : 0;
-	  org.w3c.dom.Attr array[] = new org.w3c.dom.Attr[len];
-	  for ( int i = 0; i < len; i++ ){
-	   array[i] = (org.w3c.dom.Attr)attrs.item(i);
-	  }
-	  for ( int i = 0; i < len - 1; i++ ) {
-	    String name  = array[i].getNodeName();
-	    int index = i;
-	    for ( int j = i + 1; j < len; j++ ) {
-	      String curName = array[j].getNodeName();
-		  if ( curName.compareTo(name) < 0 ) {
-		    name  = curName;
-			index = j;
-		  }
-		}
-		if ( index != i ) {
-		  org.w3c.dom.Attr temp = array[i];
-		  array[i] = array[index];
-		  array[index] = temp;
-		}
-	  }
-	  return (array);
-    }
- 
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/webserviceutils/org/eclipse/jst/ws/util/JspUtils.java b/bundles/org.eclipse.jst.ws.consumption/webserviceutils/org/eclipse/jst/ws/util/JspUtils.java
deleted file mode 100644
index abb9013..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/webserviceutils/org/eclipse/jst/ws/util/JspUtils.java
+++ /dev/null
@@ -1,50 +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.util;
-
-/**
- * @author gilberta
- *
- * To change the template for this generated type comment go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-public class JspUtils {
-	public static String markup(String text) {
-			if (text == null) {
-				return null;
-			}
-
-			StringBuffer buffer = new StringBuffer();
-			for (int i = 0; i < text.length(); i++) {
-				char c = text.charAt(i);
-				switch (c) {
-					case '<':
-						buffer.append("&lt;");
-						break;
-					case '&':
-						buffer.append("&amp;");
-						break;
-					case '>':
-						buffer.append("&gt;");
-						break;
-					case '"':
-						buffer.append("&quot;");
-						break;
-					default:
-						buffer.append(c);
-						break;
-				}
-			}
-			return buffer.toString();
-		}
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/webserviceutils/org/eclipse/jst/ws/util/SoapElementHelper.java b/bundles/org.eclipse.jst.ws.consumption/webserviceutils/org/eclipse/jst/ws/util/SoapElementHelper.java
deleted file mode 100644
index ba85190..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/webserviceutils/org/eclipse/jst/ws/util/SoapElementHelper.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.util;
-
-/**
- * @author gilberta
- *
- * To change the template for this generated type comment go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-public class SoapElementHelper {
-/*
- * This class is being gutted for the moment,
- * until a means for including saaj.jar or an
- * equivalent keeper of the javax.xml.soap package
- * can be determined. The disabling of this class
- * will only cause problems if Sample JSPs are
- * generated for Web Service proxies that have
- * SOAPElements on their interfaces.
- * 
-  public static javax.xml.soap.SOAPElement createSOAPElementFromXMLString(String xmlString) throws SoapElementRuntimeException
-  {
-    throw new SoapElementRuntimeException("SoapElement is not supported by the sample on the current runtime. Please use WebSphere v5.1 or higher.");    
-  }
-
-  public static java.lang.String soapElementWriter(javax.xml.soap.SOAPElement node,java.lang.StringBuffer buffer)
-  {
-    if (node == null ) {
-      return "";
-    }
-    
-      buffer.append(JspUtils.markup("<" + node.getElementName().getLocalName()));
-      java.util.Iterator attrs = node.getAllAttributes();
-      while(attrs.hasNext()) {
-        javax.xml.soap.Name attr = (javax.xml.soap.Name)attrs.next();
-        buffer.append(" " + attr.getQualifiedName() + "=\"" + JspUtils.markup(node.getAttributeValue(attr)) + "\"");
-      }
-      buffer.append(JspUtils.markup(">"));
-      java.util.Iterator children = node.getChildElements();
-      if ( children != null ) {
-        while(children.hasNext()){
-          javax.xml.soap.Node childNode = (javax.xml.soap.Node)children.next();
-          if(childNode instanceof javax.xml.soap.SOAPElement){
-            buffer.append("<br>");
-            soapElementWriter((javax.xml.soap.SOAPElement)childNode,buffer);
-          }
-          else
-            buffer.append(JspUtils.markup(((javax.xml.soap.Text)childNode).getValue())); 
-        }
-        buffer.append(JspUtils.markup("</" + node.getElementName().getLocalName() + ">"));
-	  }
-      return buffer.toString();
-	}
-*/
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/webserviceutils/org/eclipse/jst/ws/util/SoapElementRuntimeException.java b/bundles/org.eclipse.jst.ws.consumption/webserviceutils/org/eclipse/jst/ws/util/SoapElementRuntimeException.java
deleted file mode 100644
index 2335ef5..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/webserviceutils/org/eclipse/jst/ws/util/SoapElementRuntimeException.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.util;
-
-/**
- * @author gilberta
- *
- * To change the template for this generated type comment go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-public class SoapElementRuntimeException extends Exception  {
-
-  /**
-	 * Comment for <code>serialVersionUID</code>
-	 */
-	private static final long serialVersionUID = 3761693372674748471L;
-
-public SoapElementRuntimeException(String message){
-    super(message);
-  }
-  
-  
-      
-}
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/build.properties b/bundles/org.eclipse.jst.ws.creation.ejb.ui/build.properties
deleted file mode 100644
index fd8e379..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ejb.ui/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-bin.includes = plugin.xml,\
-               plugin.properties
-src.includes = plugin.xml,\
-               *.properties
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 77b5099..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ejb.ui/plugin.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin
-   id="org.eclipse.jst.ws.creation.ejb.ui"
-   version="1.0.0"
-   name="%PLUGIN_NAME"
-   provider-name="%PLUGIN_PROVIDER">
-
-   <requires>
-      <import plugin="org.eclipse.wst.command.env"/>
-      <import plugin="org.eclipse.wst.command.env.ui"/>
-      <import plugin="org.eclipse.wst.command.env.core"/>
-      <import plugin="org.eclipse.jst.ws"/>
-      <import plugin="org.eclipse.jst.ws.consumption"/>
-      <import plugin="org.eclipse.jst.ws.ui"/>
-      <import plugin="org.eclipse.jst.ws.consumption.ui"/>
-      <import plugin="org.eclipse.jst.ws.creation.ui"/>
-      <import plugin="org.eclipse.jdt.core"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.emf.common"/>
-      <import plugin="org.eclipse.jem.workbench"/>
-    </requires>
-
-   <!-- 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.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>
-   
-</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 275b34c..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.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<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 f5bbdc1..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-build.xml
-temp.folder
-wss-ui.jar
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/build.properties b/bundles/org.eclipse.jst.ws.creation.ui/build.properties
deleted file mode 100644
index a88e997..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/build.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-source.wss-ui.jar = src/
-bin.includes = wss-ui.jar,\
-               icons/,\
-               plugin.properties,\
-               plugin.xml
-src.includes = build.properties,\
-               icons/,\
-               plugin.properties,\
-               plugin.xml,\
-               src/
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 8024859..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/plugin.xml
+++ /dev/null
@@ -1,275 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin
-   id="org.eclipse.jst.ws.creation.ui"
-   version="1.0.0"
-   name="%PLUGIN_NAME"
-   provider-name="%PLUGIN_PROVIDER"
-   class="org.eclipse.jst.ws.internal.creation.ui.plugin.WebServiceCreationUIPlugin">
-
-   <runtime>
-      <library name="wss-ui.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-
-   <requires>
-      <import plugin="org.eclipse.wst.command.env"/>
-      <import plugin="org.eclipse.wst.command.env.ui"/>
-      <import plugin="org.eclipse.wst.command.env.core"/>
-      <import plugin="org.eclipse.wst.wsdl"/>
-      <import plugin="org.eclipse.wst.ws"/>
-      <import plugin="org.eclipse.jst.ws.explorer"/>
-      <import plugin="org.eclipse.jst.ws"/>
-      <import plugin="org.eclipse.jst.ws.consumption"/>
-      <import plugin="org.eclipse.jst.ws.ui"/>
-      <import plugin="org.eclipse.jst.ws.consumption.ui"/>
-      <import plugin="org.eclipse.jdt.core"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.emf.common"/>
-      <import plugin="org.eclipse.jem.util"/>
-      <import plugin="org.eclipse.jem.workbench"/>
-      <import plugin="org.eclipse.wst.server.core"/>
-      <import plugin="org.eclipse.wst.common.emfworkbench.integration"/>
-      <import plugin="org.eclipse.jst.j2ee"/>
-      <import plugin="org.eclipse.jst.j2ee.core"/>
-      <import plugin="org.eclipse.jst.j2ee.ejb"/>
-      <import plugin="org.wsdl4j"/>
-   </requires>
-
-   <!-- 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.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.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>
-
-</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 070258b..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceAssembleCommand.java
+++ /dev/null
@@ -1,96 +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.command.common.CreateModuleCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.AssociateModuleWithEARCommand;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebService;
-
-public class PreServiceAssembleCommand extends SimpleCommand 
-{
-	private IWebService				webService_;
-	private String						project_;
-  private String            module_;
-	private String						earProject_;
-  private String            ear_;
-	private String            j2eeLevel_;
-
-  public Status execute(Environment environment) 
-  {
-	  System.out.println( "In Pre service assemble command." );
-    
-		//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.setJ2eeLevel(j2eeLevel_);
-		Status status = command.execute(environment);
-		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_);
-		status = associateCommand.execute(environment);
-		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 b3bb574..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceDeployCommand.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.jst.ws.internal.creation.ui.extension;
-
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.Status;
-
-public class PreServiceDeployCommand extends SimpleCommand 
-{
-  public Status execute(Environment environment) 
-  {
-	System.out.println( "In Pre service deploy command." );
-
-	return super.execute(environment);
-  }
-}
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 b28a2d9..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceDevelopCommand.java
+++ /dev/null
@@ -1,211 +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.command.common.CreateModuleCommand;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.jst.ws.internal.wsrt.WebServiceRuntimeExtensionUtils;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.command.env.core.context.ResourceContext;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IContext;
-import org.eclipse.wst.ws.internal.provisional.wsrt.ISelection;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebService;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceRuntime;
-import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceInfo;
-import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceScenario;
-import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceState;
-import org.eclipse.wst.ws.internal.wsrt.SimpleContext;
-
-public class PreServiceDevelopCommand extends SimpleCommand 
-{
-  private TypeRuntimeServer typeRuntimeServer_;
-  private Environment       environment_;
-  private IContext          context_;
-  private ISelection        selection_;
-	private String						project_;
-  private String            module_;
-	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 Status execute(Environment environment) 
-  {
-	  IWebServiceRuntime wsrt   = WebServiceRuntimeExtensionUtils.getWebServiceRuntime( typeRuntimeServer_.getRuntimeId() );
-	  WebServiceInfo     wsInfo = new WebServiceInfo();
-
-	  System.out.println( "In Pre service develop command." );
-	
-	  wsInfo.setJ2eeLevel( j2eeLevel_ );
-		wsInfo.setServerFactoryId( typeRuntimeServer_.getServerId() );
-    wsInfo.setServerInstanceId( typeRuntimeServer_.getServerInstanceId());
-		wsInfo.setState( WebServiceState.UNKNOWN_LITERAL );
-		wsInfo.setWebServiceRuntimeId( typeRuntimeServer_.getRuntimeId() );
-    
-
-		environment_ = environment;
-		webService_  = wsrt.getWebService( wsInfo );
-	
-		//Set up the IContext
-		WebServiceScenario scenario = null;
-		if (typeRuntimeServer_.getTypeId().equals("org.eclipse.jst.ws.type.java"))
-		{
-			scenario = WebServiceScenario.BOTTOMUP_LITERAL;
-      String impl = (String)(selection_.getSelection())[0];
-      wsInfo.setImplURL(impl);
-		}
-		else if (typeRuntimeServer_.getTypeId().equals("org.eclipse.jst.ws.type.wsdl"))
-		{
-		  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
-		CreateModuleCommand command = new CreateModuleCommand();
-		command.setProjectName(project_);
-		command.setModuleName(module_);
-		//rsk todo -- pick the correct module type based on the Web service type, it's hard coded to WEB for now.
-		command.setModuleType(CreateModuleCommand.WEB);
-		command.setServerFactoryId(typeRuntimeServer_.getServerId());
-		command.setJ2eeLevel(j2eeLevel_);
-		Status status = command.execute(environment);
-		
-		if (status.getSeverity()==Status.ERROR)
-		{
-			environment.getStatusHandler().reportError(status);
-		}			
-	  return status;				
-  }
-  
-  public void setServiceTypeRuntimeServer( TypeRuntimeServer typeRuntimeServer )
-  {
-	  typeRuntimeServer_ = typeRuntimeServer;  
-  }
-	
-  public void setJ2eeLevel( String j2eeLevel )
-  {
-	j2eeLevel_ = j2eeLevel;  
-  }
-  
-  public String getJ2eeLevel()
-  {
-	  return j2eeLevel_;  
-  }
-	
-  public IWebService getWebService()
-  {
-	return webService_;  
-  }
-  
-  public Environment getEnvironment()
-  {
-	return environment_;
-  }
-  
-  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 void setProject( String project )
-  {
-	  project_ = project;
-  }
-	 
-  public String getModule()
-  {
-    return module_;	  
-  }
-	
-  public void setModule( String module )
-  {
-	  module_ = module;
-  }
-	
-  public String getEarProject()
-  {
-    return earProject_;	  
-  }
-	
-  public void setEarProject( String earProject )
-  {
-	  earProject_ = 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 1ab1e62..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceInstallCommand.java
+++ /dev/null
@@ -1,100 +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.command.common.AddModuleToServerCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.CreateServerCommand;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebService;
-
-public class PreServiceInstallCommand extends SimpleCommand 
-{
-	private IWebService				webService_;
-	private String						project_;
-  private String            module_;
-	private String						earProject_;
-  private String            ear_;
-		
-	  public Status execute(Environment environment) 
-	  {
-		  System.out.println( "In Pre service install command." );
-			
-			if (webService_.getWebServiceInfo().getServerInstanceId()==null)
-			{
-				CreateServerCommand createServerCommand = new CreateServerCommand();
-				createServerCommand.setServerFactoryid(webService_.getWebServiceInfo().getServerFactoryId());
-				Status createServerStatus = createServerCommand.execute(environment);
-				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_);				
-			}
-
-			Status status = command.execute(environment);
-			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 6b215d4..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceRunCommand.java
+++ /dev/null
@@ -1,44 +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.command.common.StartServerCommand;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebService;
-
-public class PreServiceRunCommand extends SimpleCommand 
-{
-	private IWebService				webService_;
-	
-	  public Status execute(Environment environment) 
-	  {
-		  System.out.println( "In Pre service run command." );
-			
-			StartServerCommand command = new StartServerCommand();
-			command.setServerInstanceId(webService_.getWebServiceInfo().getServerInstanceId());
-			Status status = command.execute(environment);
-			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 4319b96..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/ServiceRootFragment.java
+++ /dev/null
@@ -1,104 +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.wst.command.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.env.core.fragment.SimpleFragment;
-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(), "" ) );
-    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 );
-		
-  	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 10c3738..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/plugin/WebServiceCreationUIPlugin.java
+++ /dev/null
@@ -1,117 +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.env.core.common.Log;
-import org.eclipse.wst.command.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_;
-  private Log log_;
-
-  /**
-  * 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/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 23cca33..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidget.java
+++ /dev/null
@@ -1,304 +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.PreferencesSelectionWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.WebServiceClientTypeWidget;
-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.jst.ws.internal.wsrt.WebServiceRuntimeExtensionUtils;
-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.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.command.env.core.context.ResourceContext;
-import org.eclipse.wst.command.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.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 )
-  {
-	//rskreg  
-    //WebServiceServerRuntimeTypeRegistry registry   = WebServiceServerRuntimeTypeRegistry.getInstance();	  
-    LabelsAndIds                        labelIds   = WebServiceRuntimeExtensionUtils.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 Status getStatus()
-  {
-    Status status = new SimpleStatus( "" );
-    
-    // If the webservice has not been selected then user can not move
-    // forward to the next page.
-    if( webserviceType_.getText().equals("") )
-    {
-      status = new SimpleStatus( "", "", Status.ERROR );
-    }
-    
-    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 c34dcd4..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidgetDefaultingCommand.java
+++ /dev/null
@@ -1,84 +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.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ClientWizardWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.jst.ws.internal.wsrt.WebServiceRuntimeExtensionUtils;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-
-public class ServerWizardWidgetDefaultingCommand extends ClientWizardWidgetDefaultingCommand
-{    
-  private TypeRuntimeServer typeRuntimeServer_;
-  private IStructuredSelection initialSelection_;
-  
-  public Status execute(Environment env)
-  {
-    // rskreg	  
-    //WebServiceServerRuntimeTypeRegistry registry = WebServiceServerRuntimeTypeRegistry.getInstance();
-    
-    String type      = getScenarioContext().getWebServiceType();                       
-    String runtime   = WebServiceRuntimeExtensionUtils.getDefaultRuntimeValueFor( type );
-	
-    //String serverID  = WebServiceRuntimeExtensionUtils.getDefaultServerValueFor( type );
-    String factoryID = WebServiceRuntimeExtensionUtils.getDefaultServerValueFor(type);
-    // rskreg    
-    typeRuntimeServer_ = new TypeRuntimeServer();
-    
-    typeRuntimeServer_.setTypeId( type );
-    typeRuntimeServer_.setRuntimeId( runtime );
-    typeRuntimeServer_.setServerId( factoryID );
-    
-    //Default the typeId from the initial selection
-	// rskreg
-    String[] typeIds = WebServiceRuntimeExtensionUtils.getWebServiceTypeBySelection(initialSelection_);
-	// rskreg
-    if (typeIds!=null && typeIds.length>0)
-    {
-      typeRuntimeServer_.setTypeId(typeIds[0]);
-    }
-    
-    return new SimpleStatus("");
-  }
-  
-  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 8e6be1c..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.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 0ad3e57..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.jst.ws.internal.explorer.WSExplorerLauncherCommand;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.env.core.fragment.CommandFragmentFactory;
-import org.eclipse.wst.command.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.env.ui.widgets.WidgetContributorFactory;
-import org.eclipse.wst.command.env.ui.widgets.WidgetRegistry;
-
-
-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.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 1bc3060..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.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.env.core.fragment.CommandFragmentFactory;
-import org.eclipse.wst.command.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.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.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 1ac9f20..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/ServerWidgetBinding.java
+++ /dev/null
@@ -1,597 +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.ClientServerDeployableConfigCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.ComputeEndpointCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.CreateClientProjectCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.CreateMonitorCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.CreateServiceProjectCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.ManageServerStartUpCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.ServerDeployableConfigurationCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.command.CheckForMissingFiles;
-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.selection.SelectionTransformer;
-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.AddModuleDependenciesCommand;
-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.FinishJavaTestFragment;
-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.consumption.ui.wizard.WebServiceClientTypeRegistry;
-import org.eclipse.jst.ws.internal.consumption.ui.wizard.WebServiceServerRuntimeTypeRegistry;
-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.jst.ws.internal.explorer.WSExplorerLauncherCommand;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Condition;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.command.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.env.core.fragment.BooleanFragment;
-import org.eclipse.wst.command.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.env.core.fragment.CommandFragmentFactory;
-import org.eclipse.wst.command.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.env.ui.widgets.SelectionCommand;
-import org.eclipse.wst.command.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.env.ui.widgets.WidgetContributorFactory;
-import org.eclipse.wst.command.env.ui.widgets.WidgetRegistry;
-
-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.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, "ServiceProject2EARProject", ServerRuntimeSelectionWidget.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "Runtime2ClientTypes", ServerRuntimeSelectionWidget.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceTypeRuntimeServer", ServerRuntimeSelectionWidget.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", 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, "ServiceJ2EEVersion", ServerExtensionDefaultingCommand.class );
-    dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ClientTypeRuntimeServer", ClientExtensionDefaultingCommand.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ClientJ2EEVersion", ClientExtensionDefaultingCommand.class );
-    dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ServiceProject2EARProject", ServerExtensionDefaultingCommand.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "Runtime2ClientTypes", 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, "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);
-    
-    // CreateClientProjectCommand
-    dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProject", CreateClientProjectCommand.class, "ProxyProject", new StringToIProjectTransformer());
-    dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProjectEAR", CreateClientProjectCommand.class, "ProxyProjectEAR", new StringToIProjectTransformer());
-    dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProjectType", CreateClientProjectCommand.class, "ClientProjectTypeId", null);  
-    dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientServer", CreateClientProjectCommand.class, "ServerFactoryId", null);
-    dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientJ2EEVersion", CreateClientProjectCommand.class, "J2EEVersion", null);
-    dataRegistry.addMapping(ClientServerDeployableConfigCommand.class, "ServiceExistingServerInstId", CreateClientProjectCommand.class, "ExistingServerId", null);
-    dataRegistry.addMapping(ClientServerDeployableConfigCommand.class, "AddedProjectToServer", CreateClientProjectCommand.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 InitRegistries extends SimpleCommand
-  {  
-    private WebServiceClientTypeRegistry clientRegistry_ = WebServiceClientTypeRegistry.getInstance();
-    private WebServiceServerRuntimeTypeRegistry serverRegistry_ = WebServiceServerRuntimeTypeRegistry.getInstance();
-    
-    public Status execute(Environment environment) 
-    {
-      clientRegistry_.setDataMappingRegistry( dataMappingRegistry_ );
-      clientRegistry_.setWidgetRegistry( widgetRegistry_ );
-      clientRegistry_.setCanFinishRegistry( canFinishRegistry_ );
-      
-      serverRegistry_.setDataMappingRegistry( dataMappingRegistry_ );
-      serverRegistry_.setWidgetRegistry( widgetRegistry_ );
-      serverRegistry_.setCanFinishRegistry( canFinishRegistry_ );
-      
-      return new SimpleStatus( "" );
-    }
-  }
-  
-  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 SimpleFragment( new CreateClientProjectCommand(), ""));      
-      clientRoot.add( new ClientExtensionFragment() );
-      clientRoot.add( new SimpleFragment( new ClientExtensionOutputCommand(), "" ));
-      
-      setTrueFragment( clientRoot );
-    }
-    
-    public void setGenerateProxy( boolean genProxy )
-    {
-      genProxy_ = genProxy;
-    }
-    
-    /* (non-Javadoc)
-     * @see org.eclipse.wst.command.env.core.fragment.CommandFragment#registerDataMappings(org.eclipse.wst.command.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 );
-    }
-  }
-  
-  private class ServiceRootCommandFragment extends SequenceFragment
-  {
-    public ServiceRootCommandFragment()
-    {
-      //add( new SimpleFragment( new CheckForMissingFiles(), "" ) );
-      add( new SimpleFragment( new InitRegistries(), "" ) );
-      add( new SimpleFragment( new ServerWizardWidgetDefaultingCommand(), ""));
-      add( new SimpleFragment( "ServerWizardWidget" ) );
-      add( new SimpleFragment( new ServerWizardWidgetOutputCommand(), "" ));
-      add( new ObjectSelectionFragment() );
-      add( new SimpleFragment( new ServerRuntimeSelectionWidgetDefaultingCommand(), ""));
-      add( new SimpleFragment( "ServerRuntimeSelectionWidget" ) );
-      add( new SimpleFragment( new ServerExtensionDefaultingCommand(), ""));
-      //add(new SimpleFragment(new ServerDeployableConfigurationCommand(), "")); //Note: added here            
-      //add( new SimpleFragment( new CreateServiceProjectCommand(), ""));
-      //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());
-    }
-    
-    /* (non-Javadoc)
-     * @see org.eclipse.wst.command.env.core.fragment.CommandFragment#registerDataMappings(org.eclipse.wst.command.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, "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, "ClientTypeRuntimeServer", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceProject2EARProject", ServerExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "Runtime2ClientTypes", 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( ServerExtensionDefaultingCommand.class, "ServiceTypeRuntimeServer", 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 CreateServiceProjectCommand
-      dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", CreateServiceProjectCommand.class, "ProjectName", null);
-      dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProjectEAR", CreateServiceProjectCommand.class, "EarProjectName", null);
-      dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerServer", CreateServiceProjectCommand.class,"ServerFactoryId",null);
-      dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServiceJ2EEVersion", CreateServiceProjectCommand.class, "J2EEVersion", null);
-      dataRegistry.addMapping(ServerExtensionDefaultingCommand.class,"ServiceNeedEAR",CreateServiceProjectCommand.class,"NeedEAR",null);
-      dataRegistry.addMapping(ServerExtensionDefaultingCommand.class,"IsServiceProjectEJB",CreateServiceProjectCommand.class);
-      
- 
-      // Map ClientExtensionDefaultingCommand
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", ClientExtensionFragment.class);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", WebServiceClientTestArrivalCommand.class, "ClientIds", null);
-      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, "ClientProject", WebServiceClientTestArrivalCommand.class);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "LaunchedServiceTestName", WebServiceClientTestArrivalCommand.class);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProject", AddModuleDependenciesCommand.class );
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProjectEAR", WebServiceClientTestArrivalCommand.class);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientJ2EEVersion", WebServiceClientTestArrivalCommand.class, "J2eeVersion", null);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientServer", ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "Runtime2ClientTypes", WebServiceClientTestArrivalCommand.class);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "GenerateProxy", ClientTestFragment.class);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "GenerateProxy", FinishJavaTestFragment.class);
-      
-      //ServerDeployableConfigurationCommand
-      dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "StartService", ServerDeployableConfigurationCommand.class );
-      dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", ServerDeployableConfigurationCommand.class, "ServiceProject", new StringToIProjectTransformer());
-      dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(ServerExtensionOutputCommand.class, "WsdlURI", ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServiceServerInstanceId", ServerDeployableConfigurationCommand.class,"ServiceExistingServer", new ServerInstToIServerTransformer());
-      dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerServer", ServerDeployableConfigurationCommand.class,"ServiceServerTypeID", null);
-      dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ServerDeployableConfigurationCommand.class, "ClientTypeRuntimeServer", null );
-      dataRegistry.addMapping(ServerDeployableConfigurationCommand.class, "ServiceExistingServerInstId", ServerExtensionDefaultingCommand.class,"ServiceExistingServerInstanceId",null);
-      dataRegistry.addMapping(ServerDeployableConfigurationCommand.class, "SampleExistingServerInstId", ClientExtensionDefaultingCommand.class,"ClientExistingServerInstanceId", null);
-      dataRegistry.addMapping(ServerDeployableConfigurationCommand.class, "ServiceExistingServerInstId", CreateServiceProjectCommand.class,"ExistingServerId", null);
-      dataRegistry.addMapping(ServerDeployableConfigurationCommand.class, "AddedProjectToServer", CreateServiceProjectCommand.class);      
-      dataRegistry.addMapping(ServerDeployableConfigurationCommand.class, "ServiceExistingServerInstId", CreateMonitorCommand.class, "ServiceServerInstanceId", null);
-      dataRegistry.addMapping(ClientServerDeployableConfigCommand.class, "ServiceExistingServerInstId", FinishDefaultCommand.class, "ExistingServerId", null);
-
-      // Map ServerExtensionOutputCommand for ServerStart()
-      dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProjectEAR", ServerExtensionOutputCommand.class, "EarProjectName", null);
-      dataRegistry.addMapping(ServerDeployableConfigurationCommand.class, "ServiceExistingServerInstId", ServerExtensionOutputCommand.class,"ExistingServerId", null);
-          
-      // Map CreateClientProjectCommand
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProject", CreateClientProjectCommand.class, "ProxyProject", new StringToIProjectTransformer());
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProjectEAR", CreateClientProjectCommand.class, "ProxyProjectEAR", new StringToIProjectTransformer());
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientServerInstance", CreateClientProjectCommand.class, "ExistingServer", null);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientServer", CreateClientProjectCommand.class, "ServerFactoryId", null);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientJ2EEVersion", CreateClientProjectCommand.class, "J2EEVersion", null);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientNeedEAR", CreateClientProjectCommand.class, "NeedEAR", null);
-        
-      //ServerDeployableConfigurationCommand for client side
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProject", ClientServerDeployableConfigCommand.class, "SampleProject", new StringToIProjectTransformer());
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", ClientServerDeployableConfigCommand.class,"ClientTypeRuntimeServer", null);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientServerInstance", ClientServerDeployableConfigCommand.class,"SampleExistingServer", new ServerInstToIServerTransformer());
-
-      // 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);
-      
-      // 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(ServerDeployableConfigurationCommand.class, "ServiceExistingServerInstId", ManageServerStartUpCommand.class,"ServiceExistingServer", new ServerInstToIServerTransformer());
-      
-      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);    
-      dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "SampleProject",AddModuleDependenciesCommand.class);
-      dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "SampleProjectEAR",AddModuleDependenciesCommand.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 ba5be66..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/runtime/ServerRuntimeSelectionWidget.java
+++ /dev/null
@@ -1,337 +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.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.common.StringToIProjectTransformer;
-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.data.TypeRuntimeServer;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.jst.ws.internal.wsrt.WebServiceRuntimeExtensionUtils;
-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.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.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.command.env.core.selection.SelectionListChoices;
-import org.eclipse.wst.command.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.env.ui.widgets.WidgetDataEvents;
-
-/*
- *
- * 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 SelectionListChoices         serviceChoices_;
-  private TextModifyListener           textListener_;
-  private MessageUtils msgUtils_;
-  
-  private boolean isClientWidgetVisible_ = true;
-  
-  public WidgetDataEvents addControls( Composite parent, Listener statusListener )
-  {
-    msgUtils_ = new MessageUtils( pluginId_ + ".plugin", this );
-    UIUtils      uiUtils  = new UIUtils(msgUtils_, createPluginId_ ); 
-    
-    Composite root = uiUtils.createComposite( parent, 1 );
-    
-    Text messageText = new Text( root, SWT.WRAP | SWT.MULTI | SWT.READ_ONLY );
-    
-    GridData gd = new GridData(); 
-    gd.horizontalIndent = 10;
-    
-    messageText.setLayoutData(gd);
-    messageText.setText(
-        msgUtils_.getMessage("MSG_GENERAL_PROJECT_AND_EAR", new String[] { msgUtils_.getMessage("MSG_SERVICE_SUB")})
-        + "\n"
-        + 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 );
-
-    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 SelectionListChoices getServiceProject2EARProject()
-  {
-    return projectWidget_.getProjectChoices();
-  }
-  
-  public void setServiceProject2EARProject(SelectionListChoices serviceProject2EARProject)
-  {
-    projectWidget_.setProjectChoices(serviceProject2EARProject);
-  }
-  
-  public SelectionListChoices getRuntime2ClientTypes()
-  {
-    return clientWidget_.getRuntime2ClientTypes();
-  }  
-  
-  public void setRuntime2ClientTypes(SelectionListChoices runtime2ClientTypes)
-  {
-    clientWidget_.setRuntime2ClientTypes(runtime2ClientTypes);
-  }
-  
-  public String getServiceJ2EEVersion()
-  {
-    return runtimeWidget_.getJ2EEVersion();
-  }
-  
-  public void setServiceJ2EEVersion(String j2eeVersion)
-  {
-    runtimeWidget_.setJ2EEVersion(j2eeVersion);
-    projectWidget_.setJ2EEVersion(j2eeVersion);
-  }
-  
-  public String getClientJ2EEVersion()
-  {
-    return clientWidget_.getJ2EEVersion();
-  }
-  
-  public void setClientJ2EEVersion(String j2eeVersion)
-  {
-    clientWidget_.setJ2EEVersion(j2eeVersion);
-  }
-  
-  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);
-  }  
-  
-  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());
-		projectWidget_.setJ2EEVersion(runtimeWidget_.getJ2EEVersion());
-  	}
-  }
- 
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.WidgetContributor#getStatus()
-   */
-  public Status getStatus() 
-  {
-    Status serviceStatus = runtimeWidget_.getStatus();
-    Status projectStatus = projectWidget_.getStatus();
-    Status clientStatus  = clientWidget_.getStatus();    
-    Status finalStatus   = new SimpleStatus( "" );
-    
-    // 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
-    SelectionListChoices serviceProjects = projectWidget_.getProjectChoices();
-    String serviceEARName = null;
-    String serviceProjName = null;
-    String serviceServerFactoryId = null;
-    ValidationUtils valUtils = new ValidationUtils();
-    if (serviceProjects!=null)
-    {
-      serviceEARName  = serviceProjects.getChoice().getList().getSelection();
-      serviceProjName = serviceProjects.getList().getSelection();
-      serviceServerFactoryId = runtimeWidget_.getTypeRuntimeServer().getServerId();
-      String serviceJ2EElevel = runtimeWidget_.getJ2EEVersion();
-      Status serviceProjectStatus = valUtils.validateProjectTargetAndJ2EE(serviceProjName, serviceEARName, 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 = (IProject)((new StringToIProjectTransformer().transform(serviceProjName)));
-      if (serviceProj.exists())
-      {
-        //Determine whether an EJB project is required
-        String webServiceRuntimeId = runtimeWidget_.getTypeRuntimeServer().getRuntimeId();
-        String webServiceTypeId = runtimeWidget_.getTypeRuntimeServer().getTypeId();
-		// rskreg
-        //WebServiceServerRuntimeTypeRegistry wssrtRegistry = WebServiceServerRuntimeTypeRegistry.getInstance();
-        //String serverTypeId = wssrtRegistry.getWebServiceServerByFactoryId(serviceServerFactoryId).getId();
-		//String serverTypeId = wssrtRegistry.getWebServiceServerByFactoryId(serviceServerFactoryId).getId();
-        boolean isEJBRequired = WebServiceRuntimeExtensionUtils.requiresEJBModuleFor(serviceServerFactoryId, webServiceRuntimeId, webServiceTypeId);
-        if (!isEJBRequired)
-        {
-          //Check the Web service type to see if an EJB project is required
-          //isEJBRequired = wssrtRegistry.requiresEJBProject(webServiceTypeId);
-			isEJBRequired = WebServiceRuntimeExtensionUtils.requiresEJBProject(webServiceTypeId);
-        }
-        
-        if (isEJBRequired && !ResourceUtils.isEJBProject(serviceProj))
-        {
-          finalStatus = new SimpleStatus("",msgUtils_.getMessage("MSG_INVALID_EJB_PROJECT",new String[]{serviceProjName}),Status.ERROR);          
-        }
-        if (!isEJBRequired && !ResourceUtils.isWebProject(serviceProj))
-        {
-          finalStatus = new SimpleStatus("",msgUtils_.getMessage("MSG_INVALID_WEB_PROJECT",new String[]{serviceProjName}),Status.ERROR);
-        }
-      }
-    }
-    
-    if (isClientWidgetVisible_) 
-    {
-      SelectionListChoices clientProjects = clientWidget_.getProjectSelectionWidget().getProjectChoices();      
-      if (clientProjects!=null && serviceProjects!=null) 
-      {
-        String clientEARName   = clientProjects.getChoice().getList().getSelection();
-        String clientProjName  = clientProjects.getList().getSelection();
-
-        // check same EAR-ness -----
-        String warning_msg = getEARProjectWarningMessage(serviceEARName, clientEARName);
-        
-        if( clientProjName != null && serviceProjName != null && 
-            clientProjName.equalsIgnoreCase( serviceProjName ))
-        {
-          if (finalStatus.getSeverity()!=Status.ERROR)
-          {
-            warning_msg = msgUtils_.getMessage( "MSG_SAME_CLIENT_AND_SERVICE_EARS", new String[]{ "WEB" } );
-            finalStatus = new SimpleStatus( "", warning_msg, Status.WARNING );
-          }
-        }
-        else if (warning_msg != null)
-        {
-          if (finalStatus.getSeverity()!=Status.ERROR)
-          	return new SimpleStatus( "", warning_msg, Status.WARNING );          
-        }         
-      }      
-    }
-    
-    // TODO: validate projects (i.e 1.2 vs 1.3 Web Projects) against servers
-    
-    
-    
-    return finalStatus;
-  }
-  
-  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;
-
-  }  
-}
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 28f0962..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/runtime/ServerRuntimeSelectionWidgetDefaultingCommand.java
+++ /dev/null
@@ -1,586 +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.Vector;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.internal.earcreation.EARNatureRuntime;
-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.common.StringToIProjectTransformer;
-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.wizard.IWebServiceRuntime;
-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.jst.ws.internal.wsrt.WebServiceRuntimeExtensionUtils;
-import org.eclipse.wst.command.env.common.FileResourceUtils;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.command.env.core.selection.SelectionList;
-import org.eclipse.wst.command.env.core.selection.SelectionListChoices;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerUtil;
-
-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 SelectionListChoices serviceProject2EARProject_;
-  private IStructuredSelection initialSelection_;
-  private IProject initialProject_;
-  private String serviceJ2EEVersion_;
-  private boolean serviceNeedEAR_ = true;
-
-  public ServerRuntimeSelectionWidgetDefaultingCommand()
-  {
-    super();
-  }
-  
-  public Status execute(Environment env)
-  {
-    try
-    {
-     Status clientSideStatus = super.execute(env);
-     if (clientSideStatus.getSeverity()==Status.ERROR)
-     {
-       return clientSideStatus;
-     }
-     Status status = new SimpleStatus("");
-
-	 // rskreg Remove all the intelligent defaulting for M4
-     //setDefaultServiceRuntimeFromPreference();
-     //setDefaultServiceJ2EEVersionFromPreference();      
-     //webServiceRuntimeJ2EEType = getWSRuntimeAndJ2EEFromProject(initialProject_);
-     //if (webServiceRuntimeJ2EEType != null)
-     //{
-       //serviceJ2EEVersion_ = webServiceRuntimeJ2EEType.getJ2eeVersionId();
-       //serviceIds_.setRuntimeId(webServiceRuntimeJ2EEType.getWsrId()); 
-     //}
-	 
-	 serviceIds_.setRuntimeId(WebServiceRuntimeExtensionUtils.getDefaultRuntimeValueFor(serviceIds_.getTypeId()));
-	 serviceJ2EEVersion_ = (WebServiceRuntimeExtensionUtils.getWebServiceRuntimeById(serviceIds_.getRuntimeId()).getJ2eeLevels())[0]; 
-
-	 
-     // Set the default client type to a web client type.
-     setWebClientType();
-     
-     // Default projects EARs and servers.
-     //setDefaultProjects();
-     setDefaultEARs();
-     //setDefaultServer();
-	 serviceIds_.setServerId((WebServiceRuntimeExtensionUtils.getWebServiceRuntimeById(serviceIds_.getRuntimeId()).getServerFactoryIds())[0]);
-     updateServiceEARs();
-     updateClientEARs();
-	 
-     // rskreg	 
-     return status;
-    } catch (Exception e)
-    {
-      //Catch all Exceptions in order to give some feedback to the user
-      Status errorStatus = new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_TASK_EXCEPTED",new String[]{e.getMessage()}),Status.ERROR, e);
-      env.getStatusHandler().reportError(errorStatus);
-      return errorStatus;
-    }
-    
-  }  
-
-  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
-   */
-  // rskreg
-  /*
-  private WSRuntimeJ2EEType getWSRuntimeAndJ2EEFromProject(IProject project)
-  {
-    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())
-    {
-      if (ResourceUtils.isWebProject(project) || ResourceUtils.isEJBProject(project))
-      {
-        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 (wssrtReg.doesRuntimeSupportJ2EELevel(versionString, serviceIds_.getRuntimeId()) &&
-            ((runtimeTarget == null) || 
-             (runtimeTarget != null && wssrtReg.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 = wssrtReg.getRuntimesByType(serviceIds_.getTypeId());
-          for (int i = 0; i < validRuntimes.length; i++)
-          {
-            if (wssrtReg.doesRuntimeSupportJ2EELevel(versionString, validRuntimes[i]) &&
-                ((runtimeTarget == null) ||
-                 (runtimeTarget!=null && wssrtReg.doesRuntimeSupportServerTarget(runtimeTargetId, validRuntimes[i]))
-                )
-                )
-            {
-              wsrJ2EE = new WSRuntimeJ2EEType();
-              wsrJ2EE.setWsrId(validRuntimes[i]);
-              wsrJ2EE.setJ2eeVersionId(versionString);
-              return wsrJ2EE;
-            }
-          }
-        }
-      }
-    }    
-    return wsrJ2EE;
-  }
-  */
-  // rskreg
-  
-  // rskreg
-  /*
-  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 (wssrtReg.isRuntimeSupportedForType(serviceIds_.getTypeId(), pRuntimeId))
-    {
-      serviceIds_.setRuntimeId(pRuntimeId);
-    }
-    else
-    {
-      //Set the Web service runtime to one that is supported by the selected type.
-      String[] validRuntimes = wssrtReg.getRuntimesByType(serviceIds_.getTypeId());
-      if (validRuntimes != null && validRuntimes.length>0)
-      {
-        serviceIds_.setRuntimeId(validRuntimes[0]);
-      }
-    }
-  }
-  */
-  // rskreg
-  
-  // rskreg
-  /*
-  private void setDefaultServiceJ2EEVersionFromPreference()
-  {
-    if (serviceIds_ != null)
-    {
-      String runtimeId = serviceIds_.getRuntimeId();
-      if (runtimeId != null)
-      {
-        IWebServiceRuntime wsr = WebServiceServerRuntimeTypeRegistry.getInstance().getWebServiceRuntimeById(runtimeId);
-        if (wsr != null)
-        {
-          String[] versions = wsr.getJ2EEVersions();          
-          //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;
-          }
-            
-        }
-      }
-    }
-  } 
-  */ 
-  // rskreg
-  
-  // rskreg
-  /*
-  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.
-      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());
-	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 = (IProject)((new StringToIProjectTransformer().transform(projectNames[i])));
-      if (project.isOpen() && (ResourceUtils.isWebProject(project) || ResourceUtils.isEJBProject(project)))
-      {
-        //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 (serviceJ2EEVersion_!=null && serviceJ2EEVersion_.length()>0 && serviceJ2EEVersion_.equals(versionString))
-        {
-          if (wssrtReg.doesRuntimeSupportJ2EELevel(versionString, serviceIds_.getRuntimeId()) &&
-             ((runtimeTarget == null) || 
-             ((runtimeTarget!=null) && wssrtReg.doesRuntimeSupportServerTarget(runtimeTargetId, serviceIds_.getRuntimeId()))) 
-             )
-          {
-            getServiceProject2EARProject().getList().setSelectionValue(projectNames[i]);
-            return;
-          }
-        }
-      }
-    }
-    
-    //Didn't find a single project that worked. Default to a new project name.
-    getServiceProject2EARProject().getList().setSelectionValue(ResourceUtils.getDefaultWebProjectName());
-  }
-  */
-  // rskreg
-  
-  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);
-    
-  }
-  
-  // rskreg
-  /*
-  private void setDefaultServer()
-  {
-    //Calculate reasonable default server based on the default project selection. 
-
-    String initialProjectName = getServiceProject2EARProject().getList().getSelection(); 
-    IProject initialProject = (IProject)((new StringToIProjectTransformer()).transform(initialProjectName));
-    if (initialProject.exists())
-    {
-      String[] serverInfo = ServerSelectionUtils.getServerInfoFromExistingProject(initialProject, serviceIds_.getTypeId(), 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 = getServiceProject2EARProject().getChoice().getList().getSelection();
-      IProject initialEARProject = (IProject)((new StringToIProjectTransformer()).transform(initialEARProjectName));
-      if (initialEARProject.exists())
-      {
-        String[] serverInfo = ServerSelectionUtils.getServerInfoFromExistingProject(initialEARProject, serviceIds_.getTypeId(), 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]);
-          }        
-        }
-      }
-      
-    }
-    
-    
-    //Default the client server    
-  }
-  */
-  // rskreg
-  
-  private void updateServiceEARs()
-  {
-  	//Set EAR selection to null if the project/server defaults imply an EAR should not be created
-  	String serviceProjectName = getServiceProject2EARProject().getList().getSelection();
-  	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
-  	  	  getServiceProject2EARProject().getChoice().getList().setIndex(-1);
-  	  	  serviceNeedEAR_ = false;
-  	  	}
-  	  		
-  	  }
-  	}
-  	else
-  	{
-  		//Use the server type
-  		String serverTargetId = ServerUtils.getRuntimeTargetIdFromFactoryId(serviceIds_.getServerId());
-  		if (serverTargetId!=null && serverTargetId.length()>0)
-  		{
-  		  if (!ServerUtils.isTargetValidForEAR(serverTargetId,serviceJ2EEVersion_))
-  	  	  {
-  	        //Default the EAR selection to be empty
-  	  	    getServiceProject2EARProject().getChoice().getList().setIndex(-1);
-  	  	    serviceNeedEAR_ = false;
-  	  	  }
-  		}
-  	}
-  	
-  		
-  }
-  public void setInitialSelection(IStructuredSelection selection)
-  {
-    initialSelection_ = selection;
-  }
-  
-  public void setInitialProject(IProject initialProject)
-  {
-    initialProject_ = initialProject;
-  }
-  
-  public void setServiceTypeRuntimeServer( TypeRuntimeServer ids )
-  {
-    serviceIds_ = ids;
-  }
-  
-  public TypeRuntimeServer getServiceTypeRuntimeServer()
-  {
-    return serviceIds_; 
-  }
-
-  public SelectionListChoices getServiceProject2EARProject()
-  {
-    if (serviceProject2EARProject_ == null)
-    {
-	  // rskreg
-      //IProject[] projects = WebServiceServerRuntimeTypeRegistry.getInstance().getProjectsByWebServiceType(serviceIds_.getTypeId());
-	  IProject[] projects = WebServiceRuntimeExtensionUtils.getProjectsByWebServiceType(serviceIds_.getTypeId());
-	  // rskreg
-	  String[] projectNames = new String[projects.length];
-	  for (int i = 0; i < projects.length; i++) {
-  		projectNames[i] = projects[i].getName();
-	  }
-	  SelectionList list = new SelectionList(projectNames, 0);
-	  Vector choices = new Vector();
-	  for (int i = 0; i < projects.length; i++) {
-	    choices.add(getProjectEARChoice(projects[i]));
-	  }
-	  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 getServiceJ2EEVersion()
-  {
-    return serviceJ2EEVersion_;
-  }
-  
-  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 cbbd30b..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.jst.ws.internal.explorer.WSExplorerLauncherCommand;
-import org.eclipse.wst.command.env.core.common.Condition;
-import org.eclipse.wst.command.env.core.fragment.BooleanFragment;
-import org.eclipse.wst.command.env.core.fragment.SimpleFragment;
-
-
-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 fe9d04c..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.env.core.common.Condition;
-import org.eclipse.wst.command.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.env.core.fragment.BooleanFragment;
-import org.eclipse.wst.command.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.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 a01b179..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/ServiceTestWidget.java
+++ /dev/null
@@ -1,157 +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.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.command.env.core.selection.SelectionList;
-import org.eclipse.wst.command.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.env.ui.widgets.WidgetDataEvents;
-
-
-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_;
-  
-  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 wsdlURI;
-  private String launchedServiceTestName = "";
-  private Environment env;
-  private List endpoints;
-  
-  private void handleLaunchButton()
-  {
-  	
-  	String testID = testTypeCombo_.getText();
-  	launchedServiceTestName = testID;
-  	WSDLTestLaunchCommand wtlc = new WSDLTestLaunchCommand();
-  	wtlc.setTestID(testID);
-  	wtlc.setServiceTypeRuntimeServer(serviceids);
-  	wtlc.setServerProject(serverProject);
-  	wtlc.setWsdlURI(wsdlURI);
-  	wtlc.setExternalBrowser(true);
-  	wtlc.setEndpoint(endpoints);
-  	Status status = wtlc.execute(env);
-  }
-  
-  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(Environment 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;
-  }
-}
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 d87ff12..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/WebServiceTestDefaultingCommand.java
+++ /dev/null
@@ -1,101 +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.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.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.command.env.core.selection.SelectionList;
-
-
-/**
- * @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 SimpleCommand 
-{
-  
-  private SelectionList serviceTestFacilities;	
-  private Environment environment;
-  private String testID;
-  
-  public Status execute(Environment env)
-  {
-  	ScenarioContext scenarioContext = WebServicePlugin.getInstance().getScenarioContext().copy();
-  	testID = scenarioContext.getNonJavaTestService();
-  	String[] testTypes = scenarioContext.getWebServiceTestTypes();
-  	
-  	
-  	environment = env;
-  	Status status = new SimpleStatus("");
-  	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.isJava()){
-  	    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 Environment 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 275b34c..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.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<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 c6d6a02..0000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-build.xml
-temp.folder
-uddiregistry.jar
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/build.properties b/bundles/org.eclipse.jst.ws.uddiregistry/build.properties
deleted file mode 100644
index b3ed10f..0000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/build.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-source.uddiregistry.jar = src/
-bin.includes = uddiregistry.jar,\
-               icons/,\
-               plugin.properties,\
-               plugin.xml
-src.includes = build.properties,\
-               icons/,\
-               plugin.properties,\
-               plugin.xml,\
-               src/
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 41fc2e2..0000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/plugin.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin
-   id="org.eclipse.jst.ws.uddiregistry"
-   version="1.0.0"
-   name="%PLUGIN_NAME"
-   provider-name="%PLUGIN_PROVIDER"
-   class="org.eclipse.jst.ws.internal.uddiregistry.plugin.WebServiceUDDIRegistryPlugin">
-
-   <runtime>
-      <library name="uddiregistry.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-<!--
-  <description>
-  %PLUGIN_DESC
-  </description>
-  -->
-   <requires>
-      <import plugin="org.eclipse.debug.core"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.emf.common"/>
-      <import plugin="org.eclipse.jst.ws"/>
-      <import plugin="org.eclipse.jst.ws.ui"/>
-      <import plugin="org.eclipse.jst.ws.consumption"/>
-      <import plugin="org.eclipse.wst.command.env.core"/>
-      <import plugin="org.eclipse.wst.command.env"/>
-      <import plugin="org.eclipse.wst.command.env.ui"/>
-      <import plugin="org.eclipse.wst.server.core"/>
-   </requires>
-
-
-   <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.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 34a323d..0000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/plugin/WebServiceUDDIRegistryPlugin.java
+++ /dev/null
@@ -1,104 +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;
-import org.eclipse.wst.command.env.core.common.Log;
-
-/**
-* 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_;
-  private Log log_;
-  
-  /**
-  * 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 390584b..0000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionCommand.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.uddiregistry.widgets;
-
-import org.eclipse.jst.ws.internal.uddiregistry.wizard.PrivateUDDIRegistryType;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-/*
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.jst.ws.internal.uddiregistry.plugin.WebServiceUDDIRegistryPlugin;
-*/
-
-public class PrivateUDDISelectionCommand extends SimpleCommand
-{
-  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;
-  }
-}
\ 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 fd74116..0000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionCommandFragment.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.internal.uddiregistry.widgets;
-
-import org.eclipse.jst.ws.internal.uddiregistry.wizard.PrivateUDDIRegistryType;
-import org.eclipse.wst.command.env.core.CommandFactory;
-import org.eclipse.wst.command.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.env.core.fragment.AbstractCommandFragment;
-import org.eclipse.wst.command.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.env.ui.widgets.WidgetRegistry;
-
-
-public class PrivateUDDISelectionCommandFragment extends AbstractCommandFragment
-{
-  private PrivateUDDIRegistryType registryType;
-  private DataMappingRegistry dataMappingRegistry;
-  private CanFinishRegistry canFinishRegistry;
-  private WidgetRegistry widgetRegistry;
-  
-  public PrivateUDDISelectionCommandFragment()
-  {
-  	super((CommandFactory)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 4e9be34..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.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.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.command.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.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 Status getStatus()
-  {
-    PrivateUDDIRegistryType privateUDDIRegistryType = getPrivateUDDIRegistryType();
-    if (privateUDDIRegistryType != null)
-      return privateUDDIRegistryType.getOperationStatus(getOperationType());
-    else
-      return new SimpleStatus("", msgUtils.getMessage("MSG_ERROR_NO_UDDI_REGISTRY_AVAILABLE"), Status.ERROR);
-  }
-}
\ 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 1f692d2..0000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionWidgetConditionCommand.java
+++ /dev/null
@@ -1,53 +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.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Condition;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-
-
-public class PrivateUDDISelectionWidgetConditionCommand extends SimpleCommand implements Condition
-{
-  private boolean condition;
-
-  public PrivateUDDISelectionWidgetConditionCommand()
-  {
-    condition = true;
-  }
-  
-  public Status execute(Environment env)
-  {
-    condition = !condition;
-    return new SimpleStatus("");
-  }
-  
-  public Status undo(Environment env)
-  {
-    condition = !condition;
-    return new SimpleStatus("");
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.core.Command#isUndoable()
-   */
-  public boolean isUndoable()
-  {
-    return true;
-  }
-
-  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 b4b7bd7..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.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.env.core.fragment.CommandFragmentFactory;
-import org.eclipse.wst.command.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.env.ui.widgets.WidgetContributorFactory;
-import org.eclipse.wst.command.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.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 8b5b024..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.wst.command.env.core.common.Status;
-import org.eclipse.wst.command.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 Status 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 07bbc78..0000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/wizard/PrivateUDDIRegistryTypeImpl.java
+++ /dev/null
@@ -1,81 +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.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 971d6c5..0000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/wizard/PrivateUDDIRegistryTypeRegistry.java
+++ /dev/null
@@ -1,131 +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 275b34c..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.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<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 7bfad37..0000000
--- a/bundles/org.eclipse.jst.ws.ui/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-build.xml
-temp.folder
-ws-ui.jar
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/build.properties b/bundles/org.eclipse.jst.ws.ui/build.properties
deleted file mode 100644
index 2e4ccc8..0000000
--- a/bundles/org.eclipse.jst.ws.ui/build.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-source.ws-ui.jar = src/
-bin.includes = ws-ui.jar,\
-               icons/,\
-               plugin.properties,\
-               plugin.xml
-src.includes = build.properties,\
-               doc/,\
-               icons/,\
-               plugin.properties,\
-               plugin.xml,\
-               src/,\
-               test/
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 a7aee78..0000000
--- a/bundles/org.eclipse.jst.ws.ui/plugin.properties
+++ /dev/null
@@ -1,42 +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
-
-
-
-
-
-
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 509baf0..0000000
--- a/bundles/org.eclipse.jst.ws.ui/plugin.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin
-   id="org.eclipse.jst.ws.ui"
-   version="1.0.0"
-   name="%PLUGIN_NAME"
-   provider-name="%PLUGIN_PROVIDER"
-   class="org.eclipse.jst.ws.internal.ui.plugin.WebServiceUIPlugin">
-
-   <runtime>
-      <library name="ws-ui.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-
-   <requires>
-      <import plugin="org.eclipse.wst.command.env"/>
-      <import plugin="org.eclipse.wst.command.env.ui"/>
-      <import plugin="org.eclipse.wst.command.env.core"/>
-      <import plugin="org.eclipse.jst.ws"/>
-      <import plugin="org.eclipse.jdt.core"/>
-      <import plugin="org.eclipse.jdt.ui"/>
-      <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.emf.ecore"/>
-      <import plugin="org.eclipse.jem.util"/>
-      <import plugin="org.eclipse.jem.workbench"/>
-      <import plugin="org.eclipse.wst.server.core"/>
-      <import plugin="org.eclipse.wst.common.emfworkbench.integration"/>
-      <import plugin="org.eclipse.jst.j2ee"/>
-      <import plugin="org.eclipse.wst.ws"/>
-   </requires>
-
-   <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>
--->      
-
-   </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 ad92688..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.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 87b1095..0000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/action/WebServiceDeployAction.java
+++ /dev/null
@@ -1,95 +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;
-import org.eclipse.wst.server.core.ServerUtil;
-import org.eclipse.wst.server.core.IModule;
-
-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) {}
-}
- 
-
-	private IModule getModule(IProject project) {
-	
-		IModule[] modules = ServerUtil.getModules(project);
-		if (modules!=null && modules.length!=0) {
-			return modules[0];
-		}
-		return null;	
- 	}
-}
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 e4ffb0e..0000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/common/DialogResourceBrowser.java
+++ /dev/null
@@ -1,228 +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.j2ee.internal.project.J2EENature;
-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.
-* See also {@link DialogUtils#browseResources}.
-*/
-public class DialogResourceBrowser extends Dialog
-{
-  private final String INFOPOP_RESOURCE_TREE = WebServiceUIPlugin.ID + ".DRES0001";
-
-  private Shell shell_;
-  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);
-    shell_ = shell;
-
-    IResource moduleRoot = root;
-    if (root instanceof IProject)
-    {
-      IProject p = (IProject)moduleRoot;
-      J2EENature nature = (J2EENature) J2EENature.getRegisteredRuntime(p);
-      if (nature != null)
-      {
-        moduleRoot = nature.getModuleServerRoot();
-      }
-    
-    }
-
-    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 6c5d237..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.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 a7478be..0000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/dialog/ResourceSelectionDialog.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 Eclipse Public License v1.0
- * which accompanies 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 Shell shell_;
-  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);
-    shell_ = 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 0591752..0000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/plugin/WebServiceUIPlugin.java
+++ /dev/null
@@ -1,146 +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.core.runtime.Platform;
-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.env.core.common.Log;
-import org.eclipse.wst.command.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_;
-  private Log log_;
-  
-  /**
-   * 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;
-    }
-  }
-
-  public String getPluginStateLocation() {
-    return Platform.getPluginStateLocation(this).toOSString();
-  }
-
-  public String getPluginInstallLocation() {
-    try {
-      return Platform.resolve(getBundle().getEntry("/")).getFile();
-		} catch (Exception 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 7b3b67b..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.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 d9b6486..0000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ProjectTopologyPreferencePage.java
+++ /dev/null
@@ -1,313 +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_;
-  /* CONTEXT_ID PTPP0002 for the client type table viewer on the Project Topology Preference Page */
-  private final String INFOPOP_PTPP_CLIENT_TYPE = WebServiceUIPlugin.ID + ".PTPP0002";
-  /* CONTEXT_ID PTPP0003 for the move up button on the Project Topology Preference Page */
-  private final String INFOPOP_PTPP_MOVE_UP = WebServiceUIPlugin.ID + ".PTPP0003";
-  /* CONTEXT_ID PTPP0004 for the move down button on the Project Topology Preference Page */
-  private final String INFOPOP_PTPP_MOVE_DOWN = WebServiceUIPlugin.ID + ".PTPP0004";
-
-  private Button twoEAR_;
-  /* CONTEXT_ID PTPP0005 for the enable 2 EARs checkbox on the Project Topology Preference Page */
-  private final String INFOPOP_PTPP_TWO_EAR_CHECKBOX = WebServiceUIPlugin.ID + ".PTPP0005";
-
- /**
-   * 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"));
-
-    Composite clientTypeComposite = new Composite(parent, SWT.NONE);
-    GridLayout gl = new GridLayout();
-    gl.numColumns = 2;
-    gl.marginHeight = 0;
-    gl.marginWidth = 0;
-    clientTypeComposite.setLayout(gl);
-
-    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 = 0;
-    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);
-    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 5915615..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.env.core.context.ResourceContext;
-import org.eclipse.wst.command.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 e6d9d30..0000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ScenarioDefaultsPreferencePage.java
+++ /dev/null
@@ -1,332 +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.core.runtime.IConfigurationElement;
-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.ext.test.WebServiceTestRegistry;
-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.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-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";
-  //
-  private Label sampleGenerationLabel_;
-  private Combo sampleGenerationTypes_;
-  /*CONTEXT_ID PPSD0004 for the sample JSP type combo box on the Scenario Defaults Preference Page*/
-  private final String INFOPOP_PPSD_COMBO_SAMPLE_GEN = WebServiceUIPlugin.ID + ".PPSD0004";
-
-  private Label wsexplorerTypesLabel_;
-  private Combo wsexplorerTypes_;
-  /*CONTEXT_ID PPSD0003 for the web explorer type combo box on the Scenario Defaults Preference Page*/
-  private final String INFOPOP_PPSD_COMBO_EXPLORER = WebServiceUIPlugin.ID + ".PPSD0003";
-
-  /**
-   * 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"));
-
-    Composite webServiceTestTypeComposite = new Composite(parent, SWT.NONE);
-    GridLayout gl = new GridLayout();
-    gl.numColumns = 2;
-    gl.marginHeight = 0;
-    gl.marginWidth = 0;
-    webServiceTestTypeComposite.setLayout(gl);
-
-    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 = 0;
-    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
-  {
-    private IConfigurationElement[] configElements_;
-
-    public WebServiceTestTypeLabelProvider()
-    {
-      WebServiceTestRegistry wstr = WebServiceTestRegistry.getInstance();
-      configElements_ = wstr.getConfigElements();
-    }
-
-    /**
-    * @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 a518889..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.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.jst.ws/.classpath b/bundles/org.eclipse.jst.ws/.classpath
deleted file mode 100644
index 065ac06..0000000
--- a/bundles/org.eclipse.jst.ws/.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.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws/.cvsignore b/bundles/org.eclipse.jst.ws/.cvsignore
deleted file mode 100644
index b4e57fb..0000000
--- a/bundles/org.eclipse.jst.ws/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-build.xml
-temp.folder
-ws.jar
diff --git a/bundles/org.eclipse.jst.ws/.project b/bundles/org.eclipse.jst.ws/.project
deleted file mode 100644
index 1ff6289..0000000
--- a/bundles/org.eclipse.jst.ws/.project
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.ws</name>
-	<comment></comment>
-	<projects>
-		<project>org.eclipse.wst.command.env</project>
-		<project>org.eclipse.wst.command.env.core</project>
-		<project>org.eclipse.wst.wsdl</project>
-		<project>org.eclipse.wst.ws.uddi4j</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/build.properties b/bundles/org.eclipse.jst.ws/build.properties
deleted file mode 100644
index a05adb9..0000000
--- a/bundles/org.eclipse.jst.ws/build.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-src.includes = build.properties,\
-               doc/,\
-               plugin.properties,\
-               plugin.xml,\
-               src/,
-bin.includes = plugin.properties,\
-               plugin.xml,\
-               ws.jar
-source.ws.jar = src/
diff --git a/bundles/org.eclipse.jst.ws/component.xml b/bundles/org.eclipse.jst.ws/component.xml
deleted file mode 100644
index 848c8b5..0000000
--- a/bundles/org.eclipse.jst.ws/component.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component xmlns="http://eclipse.org/wtp/releng/tools/component-model" name="org.eclipse.jst.ws">
-   <component-depends unrestricted="true">
-   </component-depends>
-   <plugin id="org.eclipse.jst.ws" fragment="false"/>
-   <plugin id="org.eclipse.jst.ws.axis.consumption.core" fragment="false"/>
-   <plugin id="org.eclipse.jst.ws.axis.consumption.ui" fragment="false"/>
-   <plugin id="org.eclipse.jst.ws.axis.creation.ui" fragment="false"/>
-   <plugin id="org.eclipse.jst.ws.consumption" fragment="false"/>
-   <plugin id="org.eclipse.jst.ws.consumption.ui" fragment="false"/>
-   <plugin id="org.eclipse.jst.ws.creation.ejb.ui" fragment="false"/>
-   <plugin id="org.eclipse.jst.ws.creation.ui" fragment="false"/>
-   <plugin id="org.eclipse.jst.ws.explorer" fragment="false"/>
-   <plugin id="org.eclipse.jst.ws.uddiregistry" fragment="false"/>
-   <plugin id="org.eclipse.jst.ws.ui" fragment="false"/>
-</component>
diff --git a/bundles/org.eclipse.jst.ws/plugin.properties b/bundles/org.eclipse.jst.ws/plugin.properties
deleted file mode 100644
index 505a8be..0000000
--- a/bundles/org.eclipse.jst.ws/plugin.properties
+++ /dev/null
@@ -1,16 +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
-PLUGIN_PROVIDER=Eclipse.org
diff --git a/bundles/org.eclipse.jst.ws/plugin.xml b/bundles/org.eclipse.jst.ws/plugin.xml
deleted file mode 100644
index 6d6120d..0000000
--- a/bundles/org.eclipse.jst.ws/plugin.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin
-   id="org.eclipse.jst.ws"
-   version="1.0.0"
-   name="%PLUGIN_NAME"
-   provider-name="%PLUGIN_PROVIDER"
-   class="org.eclipse.jst.ws.internal.plugin.WebServicePlugin">
-
-   <runtime>
-      <library name="ws.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-
-   <requires> 
-      <import plugin="org.eclipse.wst.command.env"/>
-      <import plugin="org.eclipse.wst.command.env.ui"/>
-      <import plugin="org.eclipse.wst.command.env.core"/>
-      <import plugin="org.eclipse.jem.util"/>
-      <import plugin="org.eclipse.jem.workbench"/>
-      <import plugin="org.eclipse.jem"/>
-      <import plugin="org.eclipse.jdt.core"/>
-      <import plugin="org.eclipse.emf.common"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.jface"/>
-      <import plugin="org.eclipse.emf.ecore"/>
-      <import plugin="org.eclipse.debug.core"/>
-      <import plugin="org.eclipse.jem.workbench"/>
-      <import plugin="org.eclipse.wst.server.core"/>
-      <import plugin="org.eclipse.wst.server.ui"/>
-      <import plugin="org.eclipse.wst.wsdl"/>
-      <import plugin="org.eclipse.jst.j2ee.core"/>
-      <import plugin="org.eclipse.jst.j2ee.ejb"/>
-      <import plugin="org.eclipse.jst.j2ee"/>
-      <import plugin="org.eclipse.jst.j2ee.web"/>
-      <import plugin="org.eclipse.wst.common.emfworkbench.integration"/>
-      <import plugin="org.eclipse.wst.web"/>
-      <import plugin="org.eclipse.wst.common.modulecore"/>
-      <import plugin="org.wsdl4j"/>
-      <import plugin="org.uddi4j"/>
-   </requires>
-
-</plugin>
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/command/NullStatusMonitor.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/command/NullStatusMonitor.java
deleted file mode 100644
index fb2cbc2..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/command/NullStatusMonitor.java
+++ /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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.command;
-
-import java.util.Vector;
-
-import org.eclipse.core.runtime.IStatus;
-
-/**
-* A NullStatusRenderer throws away IStatus information.
-*/
-public class NullStatusMonitor implements StatusMonitor
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  protected boolean result;
-
-  /**
-  * Default constructor.
-  */
-  public NullStatusMonitor ()  {}
-  /**
-  * Does nothing.
-  */
-  public int reportStatus(IStatus status, Vector options) { return 0; }
-  public boolean reportStatus(IStatus status) 
-  { 
-    switch (status.getSeverity())
-    {
-      case IStatus.ERROR:
-      case IStatus.WARNING:
-      		result = false;
-      		break;
-	  case IStatus.INFO:
-      default: //IStatus.OK
-      		result = true; 
-      		break;
-     }
- 	return result;
-  }
-  public void dumpSavedStatus() { }
-  public boolean canContinue() 
-  { 
-	return result;
-  }
-
-  public void reset () {
-  		result = true;
-  	}
-}
-
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/command/StatusMonitor.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/command/StatusMonitor.java
deleted file mode 100644
index cfe91de..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/command/StatusMonitor.java
+++ /dev/null
@@ -1,38 +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.command;
-
-import java.util.Vector;
-
-import org.eclipse.core.runtime.IStatus;
-
-/**
-* A StatusMonitor reports IStatus information to a display system.
-*/
-public interface StatusMonitor
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  /**
-  * reports the contents of the given status object.
-  * Subclasses must implement this method to report
-  * IStatus information to a given display system,
-  * such as SWT, the command line, or a trace file.
-  */
-  public int reportStatus(IStatus status, Vector options);
-  public boolean reportStatus(IStatus status);
-  public void dumpSavedStatus();
-  public boolean canContinue();
-  public void reset();
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/command/StatusRenderer.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/command/StatusRenderer.java
deleted file mode 100644
index 0cff3a6..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/command/StatusRenderer.java
+++ /dev/null
@@ -1,32 +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.command;
-
-import org.eclipse.core.runtime.IStatus;
-
-/**
-* A StatusRenderer renders IStatus information to a display system.
-*/
-public interface StatusRenderer
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  /**
-  * Renders the contents of the given status object.
-  * Subclasses must implement this method to render
-  * IStatus information to a given display system,
-  * such as SWT, the command line, or a trace file.
-  */
-  public void render ( IStatus status );
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/AnyFilter.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/AnyFilter.java
deleted file mode 100644
index ba00a10..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/AnyFilter.java
+++ /dev/null
@@ -1,85 +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.common;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-
-
-/**
-* This is a kind of {@link Filter} that accepts all objects,
-* and is a suitable base class for new <code>Filters</code>.
-*/
-public class AnyFilter implements Filter
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  /**
-  * Constructs a new <code>AnyFilter</code>.
-  */
-  public AnyFilter ()
-  {
-  }
-
-  /**
-  * Returns the locale-specific name of this filter.
-  * @return The locale-specific name of this filter.
-  */
-  public String getName ()
-  {
-    return WebServicePlugin.getMessage("%ANY_FILTER_NAME");
-  }
-
-  /**
-  * Returns the locale-specific description of this filter.
-  * @return The locale-specific description of this filter.
-  */
-  public String getDescription ()
-  {
-    return WebServicePlugin.getMessage("%ANY_FILTER_DESC");
-  }
-
-  /**
-  * Returns an {@link org.eclipse.core.runtime.IStatus}
-  * describing the <code>Filter</code>'s assessment of
-  * the given <code>object</code>.
-  * See {@link Filter#statusOf} for general comments.
-  * The default implementation of <code>AnyFilter</code>
-  * returns a status with severity <code>IStatus.OK</code>.
-  * Subclasses may override.
-  * @param object The object to filter.
-  * @return An {@link org.eclipse.core.runtime.IStatus}.
-  */
-  public IStatus statusOf ( Object object )
-  {
-    return new Status(IStatus.OK,WebServicePlugin.ID,0,"",null);
-  }
-
-  /**
-  * Returns true if and only if {@link #statusOf} returns
-  * an {@link org.eclipse.core.runtime.IStatus} with a
-  * severity of less than <code>IStatus.ERROR</code>.
-  * Subclasses may override to provide a higher-performance
-  * implementation.
-  * @param object The object to filter.
-  * @return True if and only if {@link #statusOf} returns
-  * an {@link org.eclipse.core.runtime.IStatus} with a
-  * severity of less than <code>IStatus.ERROR</code>.
-  */
-  public boolean accepts ( Object object )
-  {
-    return !statusOf(object).matches(IStatus.ERROR);
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/EnvironmentUtils.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/EnvironmentUtils.java
deleted file mode 100644
index e86d149..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/EnvironmentUtils.java
+++ /dev/null
@@ -1,167 +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.common;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.ProgressMonitor;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.command.env.core.context.ResourceContext;
-import org.eclipse.wst.command.env.core.context.TransientResourceContext;
-import org.eclipse.wst.command.env.ui.eclipse.EclipseEnvironment;
-import org.eclipse.wst.command.env.ui.eclipse.EclipseProgressMonitor;
-
-
-
-/**
- * 
- */
-public final class EnvironmentUtils
-{
-  /**
-   * @param env
-   * @return IProgressMonitor
-   */
-  public static IProgressMonitor getIProgressMonitor(Environment env)
-  {
-  	 ProgressMonitor monitor = env.getProgressMonitor();
-     	 IProgressMonitor eclipseMonitor = null;
-     	 if (monitor instanceof EclipseProgressMonitor)
-     	 {
-     	 	eclipseMonitor = ((EclipseProgressMonitor)monitor).getMonitor();
-     	 }
-     	 return eclipseMonitor;
-  }
-  
-  
-   
-  /**
-   * 
-   * @param env This should be an EclipseEnvironment.
-   * @return Returns a ResourceContext.
-   */ 
-  public static ResourceContext getResourceContext( Environment env )
-  {
-    ResourceContext context = null;
-    
-    if( env instanceof EclipseEnvironment )
-    {
-      context = ((EclipseEnvironment)env).getResourceContext();
-    }
-    else
-    {
-      context = new TransientResourceContext();
-    }
-    
-    return context;
-  }
-  
-  /**
-   * @param istatus
-   * @return Status
-   */
-
-  /**
-   * TODO: Delete. There's a replacement in the env plugin. 
-   */
-  public static Status convertIStatusToStatus(IStatus istatus)
-  {
-    Status status;
-    String message = istatus.getMessage();
-    IStatus[] children = istatus.getChildren();
-    int noOfChildren = children.length;
-    if (noOfChildren > 0)
-    {
-      Status[] statusChildren = new Status[noOfChildren];
-      for (int i=0;i<noOfChildren;i++)
-      {
-        statusChildren[i] = convertIStatusToStatus(children[i]);
-      }
-
-      status = new SimpleStatus("",message,statusChildren);
-    }
-    else
-    {
-      int severity = istatus.getSeverity();
-      int statusSeverity = Status.OK;
-      switch (severity)
-      {
-        case IStatus.ERROR:
-          statusSeverity = Status.ERROR;
-        	break;
-        case IStatus.WARNING:
-          statusSeverity = Status.WARNING;
-        	break;
-        case IStatus.INFO	:
-          statusSeverity = Status.INFO;
-        	break;      	
-        case IStatus.OK:
-          statusSeverity = Status.OK;
-        	break;      	
-        default:
-      }
-      Throwable e = istatus.getException();
-      status = new SimpleStatus("",message,statusSeverity,e);
-    }
-      
-    return status;
-  }
-
-  /**
-   * TODO: Delete. There's a replacement in the env plugin. 
-   */
-  public static IStatus convertStatusToIStatus(Status status, String pluginId)
-  {
-    IStatus istatus;
-    String message = status.getMessage();
-    Throwable throwable = status.getThrowable();
-    if (status.hasChildren())
-    {
-      Status[] children = status.getChildren();
-      int noOfChildren = children.length;
-      IStatus[] istatusChildren = new IStatus[noOfChildren];
-      for (int i=0;i<noOfChildren;i++)
-      {
-        istatusChildren[i] = convertStatusToIStatus(children[i], pluginId);
-      }
-
-      istatus = new MultiStatus(pluginId,0,istatusChildren,message,throwable);
-    }
-    else
-    {
-      int severity = status.getSeverity();
-      int istatusSeverity = IStatus.OK;
-      switch (severity)
-      {
-        case Status.ERROR:
-          istatusSeverity = IStatus.ERROR;
-        	break;
-        case Status.WARNING:
-          istatusSeverity = IStatus.WARNING;
-        	break;
-        case Status.INFO:
-          istatusSeverity = IStatus.INFO;
-        	break;      	
-        case Status.OK:
-          istatusSeverity = IStatus.OK;
-        	break;      	
-        default:
-      }      
-      istatus = new org.eclipse.core.runtime.Status(istatusSeverity,pluginId,0,message,throwable);
-    }
-      
-    return istatus;
-  }  
-  
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/Filter.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/Filter.java
deleted file mode 100644
index 91f0bf8..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/Filter.java
+++ /dev/null
@@ -1,89 +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.common;
-
-import org.eclipse.core.runtime.IStatus;
-
-/**
-* This is the interface for a class of objects that filter
-* other objects for inclusion or exclusion by some consumer.
-*/
-public interface Filter
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  /**
-  * 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 an {@link org.eclipse.core.runtime.IStatus}
-  * describing the <code>Filter</code>'s assessment of
-  * the given <code>object</code>.
-  * The severity of the
-  * returned <code>IStatus</code> is as follows:
-  * <ul>
-  * <li>
-  * {@link org.eclipse.core.runtime.IStatus#OK}
-  * if the <code>Filter</code> accepts the <code>object</code>
-  * with no further information for the caller (meaning the
-  * {@link org.eclipse.core.runtime.IStatus#getMessage} and
-  * {@link org.eclipse.core.runtime.IStatus#getException} methods
-  * are ignored).
-  * <li>
-  * {@link org.eclipse.core.runtime.IStatus#INFO}
-  * if the <code>Filter</code> accepts the <code>object</code>
-  * Additional information may be available from the
-  * {@link org.eclipse.core.runtime.IStatus#getMessage} and
-  * {@link org.eclipse.core.runtime.IStatus#getException} methods.
-  * <li>
-  * {@link org.eclipse.core.runtime.IStatus#WARNING}
-  * if the <code>Filter</code> accepts the <code>object</code>.
-  * Additional information may be available from the
-  * {@link org.eclipse.core.runtime.IStatus#getMessage} and
-  * {@link org.eclipse.core.runtime.IStatus#getException} methods.
-  * <li>
-  * {@link org.eclipse.core.runtime.IStatus#ERROR}
-  * if the <code>Filter</code> does not accept the <code>object</code>.
-  * Additional information may be available from the
-  * {@link org.eclipse.core.runtime.IStatus#getMessage} and
-  * {@link org.eclipse.core.runtime.IStatus#getException} methods.
-  * </ul>
-  * @param object The object to filter.
-  * @return An {@link org.eclipse.core.runtime.IStatus}
-  * describing the <code>Filter</code>'s assessment of
-  * the given <code>object</code>.
-  */
-  public IStatus statusOf ( Object object );
-
-  /**
-  * 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/src/org/eclipse/jst/ws/internal/common/IProjectToStringTransformer.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/IProjectToStringTransformer.java
deleted file mode 100644
index 7030001..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/IProjectToStringTransformer.java
+++ /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
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.common;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.wst.command.env.core.data.Transformer;
-
-
-
-/**
- * Transfroms a org.eclipse.core.runtime.IProject to java.lang.String
- */
-public class IProjectToStringTransformer implements Transformer {
-	
-	  public Object transform(Object value)
-	  {
-	  	IProject project = (IProject)value;
-	    return project.getName();
-	  }	
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/J2EEActionAdapterFactory.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/J2EEActionAdapterFactory.java
deleted file mode 100644
index 1998dbe..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/J2EEActionAdapterFactory.java
+++ /dev/null
@@ -1,100 +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 May 8, 2004
- */
-package org.eclipse.jst.ws.internal.common;
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.internal.impl.ServiceImpl;
-import org.eclipse.wst.wsdl.util.WSDLResourceImpl;
-
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-
-
-/**
- * @author gilberta
- */
-public class J2EEActionAdapterFactory {
-	
- 	
-  public static String getWSDLURI(ServiceImpl serviceImpl)
-  {
-  	Definition definition = serviceImpl.getEnclosingDefinition();
-  	String location = definition.getLocation();
-  	
-  	return location;
-  }
-   
-  //has to be under the webcontent
-  public static String WEB_CONTENT = "WebContent";
-  public static String getWSDLURI(ServiceRef serviceImpl)
-  {
-  	IProject project = ProjectUtilities.getProject(serviceImpl);
-  	IPath path = project.getLocation().addTrailingSeparator();
-  	path = path.append(WEB_CONTENT).addTrailingSeparator();
-  	path = path.append(serviceImpl.getWsdlFile());
-  	File file = new File(path.toString());
-  	try{
-  	  URL url = file.toURL();
-  	  return url.toString();
-  	}catch(MalformedURLException e){return null;}
-  	
- }
-  
-  public static String getWSDLURI(WSDLResourceImpl wsdlRI)
-  {
-  	Definition definition = wsdlRI.getDefinition();
-  	String location = definition.getLocation();
-  	
-  	return location;
-  }
-  
-  public static String getWSILPath(WSDLResourceImpl wsdlRI)
-  {
-  	return convertToRelative(getWSDLURI(wsdlRI));
-  }
-  
-  public static String getWSILPath(ServiceRef serviceImpl)
-  {
-  	return convertToRelative(getWSDLURI(serviceImpl));
-  }
-  
-  public static String getWSILPath(ServiceImpl serviceImpl)
-  {
-  	return convertToRelative(getWSDLURI(serviceImpl));
-  }
-  
-  public static String FILE="file:/";
-  public static String FILEL="file:"; 
-  public static String convertToRelative(String uri)
-  {
-  	//remove file:
-  	String root = ResourcesPlugin.getWorkspace().getRoot().getLocation().toString();
-    root = FILE + root;
-  	String rootL = FILEL + root;
-    if(uri.startsWith(root) || uri.startsWith(rootL)){
-      return uri.substring(root.length());  	
-    }
-    return uri;
-  }
-
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/J2EEUtils.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/J2EEUtils.java
deleted file mode 100644
index 6596f6e..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/J2EEUtils.java
+++ /dev/null
@@ -1,1687 +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.common;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-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.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.applicationclient.componentcore.util.AppClientArtifactEdit;
-import org.eclipse.jst.j2ee.componentcore.util.EARArtifactEdit;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.Session;
-import org.eclipse.jst.j2ee.ejb.SessionType;
-import org.eclipse.jst.j2ee.ejb.componentcore.util.EJBArtifactEdit;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.earcreation.AddModuleToEARProjectCommand;
-import org.eclipse.jst.j2ee.internal.earcreation.EARNatureRuntime;
-import org.eclipse.jst.j2ee.internal.earcreation.IEARNatureConstants;
-import org.eclipse.jst.j2ee.internal.ejb.project.EJBNatureRuntime;
-import org.eclipse.jst.j2ee.internal.project.IEJBNatureConstants;
-import org.eclipse.jst.j2ee.internal.project.J2EENature;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.internal.web.operations.J2EEWebNatureRuntime;
-import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit;
-import org.eclipse.wst.command.env.common.FileResourceUtils;
-import org.eclipse.wst.command.env.core.common.Log;
-import org.eclipse.wst.command.env.eclipse.EclipseLog;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.StructureEdit;
-import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerUtil;
-/**
- * This class contains some useful J2EE utilities.
- * 
- * @author Peter Moogk
- * @date August 23, 2001
- */
-public final class J2EEUtils {
-	private static final String webProjectNature = IModuleConstants.JST_WEB_MODULE; // IWebNatureConstants.J2EE_NATURE_ID;
-	private static final String ejbProjectNature = IModuleConstants.JST_EJB_MODULE; // IEJBNatureConstants.NATURE_ID;
-	private static final String earProjectNature = IModuleConstants.JST_EAR_MODULE; // IEARNatureConstants.NATURE_ID;
-
-	
-	/**
-	 * Returns an IVirtualComponent
-	 * @param project
-	 * @param componentName
-	 * @return
-	 */
-	public static IVirtualComponent getIVirtualComponent(IProject project, String componentName){
-		return ComponentCore.createComponent(project, componentName);
-	}
-	
-	/**
-	 * Returns the J2EE version id (defined in J2EEVersionConstants) of the
-	 * project. If the project does not have a J2EENature, -1 is returned.
-	 * 
-	 * @param p
-	 * @return the J2EE version id (defined in J2EEVersionConstants), -1 if p
-	 *         does not have a J2EENature.
-	 * 
-	 * @deprecated this method only returns the first module's j2ee version
-	 * 				use getJ2EEVersion(IProject, String)
-	 */
-	public static int getJ2EEVersion(IProject p) {
-		int j2eeVer = -1;
-		StructureEdit mc = null;
-		try {
-			mc = StructureEdit.getStructureEditForRead(p);
-			WorkbenchComponent[] wbcs = mc.getWorkbenchModules();
-			if (wbcs.length!=0) {
-//				j2eeVer = getWebModuleJ2EEVersion(wbcs[0]);
-			}
-		}
-		catch (Exception e){
-			//handle exception
-		}
-		finally{
-			if (mc!=null)
-				mc.dispose();
-		}
-		return j2eeVer;
-	}
-
-	/**
-	 * TODO: Implement this method
-	 * @param p
-	 * @param module
-	 * @return
-	 */
-	public static int getJ2EEVersion(IProject p, String componentName){
-		int j2eeVer = -1;
-		StructureEdit mc = null;
-		try {
-			mc = StructureEdit.getStructureEditForRead(p);
-			WorkbenchComponent[] wbcs = mc.getWorkbenchModules();
-			
-			for (int i=0;i<wbcs.length;i++){
-				if (wbcs[i].getName().equals(componentName)){
-					j2eeVer = getComponentJ2EEVersion(p, wbcs[i]);
-				}
-			}
-			
-		}
-		catch (Exception e){
-			//handle exception
-		}
-		finally{
-			if (mc!=null)
-				mc.dispose();
-		}
-		return j2eeVer;	
-	}
-	
-	/**
-	 * Returns the J2EEVersion of the component identified by project and component name
-	 * @param project
-	 * @param wbc
-	 * @return int version if applicable, otherwise returns -1
-	 */
-	private static int getComponentJ2EEVersion(IProject project, WorkbenchComponent wbc){
-		int j2eeVer = -1;
-		//check type
-		if (wbc!=null) {
-			if (isWebComponent(project, wbc.getName()))
-				j2eeVer = getWebComponentJ2EEVersion(wbc);
-			if (isAppClientComponent(project, wbc.getName()))
-				j2eeVer = getAppClientComponentJ2EEVersion(wbc);
-			if (isEJBComponent(project, wbc.getName()))
-				j2eeVer = getEJBComponentJ2EEVersion(wbc);
-			if (isEARComponent(project, wbc.getName()))
-				j2eeVer = getEARComponentJ2EEVersion(wbc);
-					
-			// TODO: isJavaComponent
-			
-		}
-		return j2eeVer;
-	}
-	
-	/**
-	 * Return's the EAR module's J2EEVersion
-	 * @param wbc
-	 * @return
-	 */
-	private static int getEARComponentJ2EEVersion(WorkbenchComponent wbc){
-		EARArtifactEdit edit = null;
-		int nVersion = 12;
-		try {
-			edit = EARArtifactEdit.getEARArtifactEditForRead(wbc);
-			if (edit != null) {
-				nVersion = edit.getJ2EEVersion();
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		} finally {
-			if (edit != null)
-				edit.dispose();
-		}
-		return nVersion;		
-	}
-	
-	
-	/**
-	 * 
-	 * @param p
-	 * @return
-	 * @deprecated
-	 */
-	public static String getJ2EEVersionAsString(IProject p){
-		int j2eeVer = getJ2EEVersion(p);
-		if (j2eeVer!=-1){
-			return String.valueOf(j2eeVer);
-		}
-		else 
-			return null;
-	}
-	
-	/**
-	 * TODO
-	 * @param p
-	 * @param compName
-	 * @return
-	 */
-	public static String getJ2EEVersionAsString(IProject p, String compName){
-		int j2eeVer = getJ2EEVersion(p);
-		if (j2eeVer!=-1){
-			return String.valueOf(j2eeVer);
-		}
-		else 
-			return null;
-	}
-	
-	/**
-	 * Returns the Web Module's J2EE version
-	 * @param wbModule
-	 * @return the J2EE version id
-	 */
-	private static int getWebComponentJ2EEVersion(WorkbenchComponent wbModule) {
-		WebArtifactEdit webEdit = null;
-		int nVersion = 12;
-		try {
-			webEdit = WebArtifactEdit.getWebArtifactEditForRead(wbModule);
-			if (webEdit != null) {
-				nVersion = webEdit.getJ2EEVersion();
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		} finally {
-			if (webEdit != null)
-				webEdit.dispose();
-		}
-		return nVersion;
-	}
-
-	/**
-	 * Returns Application client's J2EE version
-	 * @param wbc
-	 * @return
-	 */
-	private static int getAppClientComponentJ2EEVersion(WorkbenchComponent wbc){
-		AppClientArtifactEdit edit = null;
-		int nVersion = 12;
-		try {
-			edit = AppClientArtifactEdit.getAppClientArtifactEditForRead(wbc);
-			if (edit != null) {
-				nVersion = edit.getJ2EEVersion();
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		} finally {
-			if (edit != null)
-				edit.dispose();
-		}
-		return nVersion;		
-	}
-	
-	/**
-	 * Returns EJB component's J2EE version
-	 * @param wbc
-	 * @return
-	 */
-	private static int getEJBComponentJ2EEVersion(WorkbenchComponent wbc){
-		EJBArtifactEdit edit = null;
-		int nVersion = 12;
-		try {
-			edit = EJBArtifactEdit.getEJBArtifactEditForRead(wbc);
-			if (edit != null) {
-				nVersion = edit.getJ2EEVersion();
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		} finally {
-			if (edit != null)
-				edit.dispose();
-		}
-		return nVersion;			
-	}
-	
-	/**
-	 * This method returns all of the EAR projects that reference the specified
-	 * project.
-	 * 
-	 * @deprecated
-	 */
-	public static EARNatureRuntime[] getEARProjects(IProject project) {
-		
-		EARNatureRuntime[] ears = J2EEProjectUtilities.getReferencingEARProjects(project);
-		return ears;
-	}
-	
-	/**
-	 * Returns the EAR components in a Project
-	 * @param project
-	 * @return empty if no EAR components, null if no components at all
-	 */
-	public static String[] getEARComponents(IProject project){
-		
-		//get all components in the project
-		StructureEdit mc = null;
-		String[] earComponents = new String[0];
-		try {
-			mc = StructureEdit.getStructureEditForRead(project);
-			WorkbenchComponent[] wbcs = mc.getWorkbenchModules();
-			earComponents = new String[wbcs.length];
-			for (int i=0;i<wbcs.length;i++){
-				if (isEARComponent(project, wbcs[i].getName()))
-					earComponents[i] = wbcs[i].getName();
-			}
-		}
-		catch (Exception e){
-			//handle exception
-		}
-		finally{
-			if (mc!=null)
-				mc.dispose();
-		}		
-		return earComponents;
-	}
-	
-	/**
-	 * Returns Web components names in a project
-	 * @param project
-	 * @return empty array if no web components
-	 */
-	public static String[] getWebComponents(IProject project){
-		
-		//get all components in the project
-		StructureEdit mc = null;
-		String[] components = new String[0];
-		try {
-			mc = StructureEdit.getStructureEditForRead(project);
-			WorkbenchComponent[] wbcs = mc.getWorkbenchModules();
-			components = new String[wbcs.length];
-			for (int i=0;i<wbcs.length;i++){
-				if (isWebComponent(project, wbcs[i].getName()))
-					components[i] = wbcs[i].getName();
-			}
-			
-		}
-		catch (Exception e){
-			//handle exception
-		}
-		finally{
-			if (mc!=null)
-				mc.dispose();
-		}		
-		return components;
-	} 
-	
-	/**
-	 * True if there exists a underlying resource backing up the component and project 
-	 * @param projectName
-	 * @param componentName
-	 * @return
-	 */
-	public static boolean exists(String projectName, String componentName){
-		IProject project = null;
-		if (projectName!=null && projectName.length() > 0 )
-		  project = FileResourceUtils.getWorkspaceRoot().getProject(projectName);
-		else 
-			return false;
-		
-		return exists(project, componentName);
-	}
-	
-	/**
-	 * True if there exists a underlying resource backing up the component and project
-	 * @param project
-	 * @param componentName
-	 * @return
-	 */
-	private static boolean exists(IProject project, String componentName){
-		if (project!=null && 
-				componentName!=null && 
-				componentName.length() > 0) {
-			IVirtualComponent vc = ComponentCore.createComponent(project, componentName);
-			return vc.exists();
-		}
-		else 
-			return false;
-		
-	}
-	
-	/**
-	 * 
-	 * @param project
-	 * @return
-	 * 
-	 * @deprecated  --  use getEARProjects(IProject)
-	 */
-//	public static String[] getEARProjectNamesForWebProject(IProject project) {
-//		Vector EARNames = new Vector();
-//		if (project != null) {
-//			EARNatureRuntime[] ears = getEARProjects(project);
-//			for (int i = 0; i < ears.length; i++) {
-//				EARNames.add(ears[i].getProject().getName());
-//			}
-//		}
-//		return EARNames.isEmpty() ? null : (String[]) EARNames
-//				.toArray(new String[0]);
-//	}
-
-	/**
-	 * This method returns all of the EAR projects that reference the specified
-	 * ejb project.
-	 * 
-	 * @deprecated  - use getEARProjects(IProject)
-	 */
-	public static EARNatureRuntime[] getEJBEARProjects(IProject project) {
-		EARNatureRuntime[] ears = J2EEProjectUtilities.getReferencingEARProjects(project);
-		return ears;
-	}
-
-	/**
-	 * 
-	 * @param project
-	 * @return
-	 * @deprecated use getEARProjectNames (not used; to be deleted)
-	 */
-	public static String[] getEARProjectNamesForEJBProject(IProject project) {
-		Vector EARNames = new Vector();
-		if (project != null) {
-			EARNatureRuntime[] ears = getEJBEARProjects(project);
-			for (int i = 0; i < ears.length; i++) {
-				EARNames.add(ears[i].getProject().getName());
-			}
-		}
-		return EARNames.isEmpty() ? null : (String[]) EARNames
-				.toArray(new String[0]);
-	}
-
-	/**
-	 * 
-	 * @param project
-	 * @return
-	 * @deprecated not used; to be deleted
-	 */
-	public static EARNatureRuntime[] getAppClientEARProjects(IProject project) {
-		EARNatureRuntime[] ears = J2EEProjectUtilities.getReferencingEARProjects(project);
-		return ears;
-	}
-
-	/**
-	 * Returns the EAR nature runtime from an EAR project
-	 * 
-	 * @param IProject
-	 *            the EAR project
-	 * @return EARNatureRuntime of the project
-	 * 
-	 * @deprecated not used; to be deleted
-	 */
-	public static EARNatureRuntime getEARNatureRuntimeFromProject(
-			IProject project) {
-		return EARNatureRuntime.getRuntime(project);
-	}
-
-	/**
-	 * This method returns a list of EAR names that are referenced by the
-	 * specified web project.
-	 * 
-	 * @deprecated not used; to be deleted
-	 */
-	public static String[] getEARNames(IProject project) {
-		EARNatureRuntime[] ears = getEARProjects(project);
-		String[] earNames = new String[ears == null ? 0 : ears.length];
-
-		for (int index = 0; index < earNames.length; index++) {
-			earNames[index] = ears[index].getProject().getName();
-		}
-
-		return earNames;
-	}
-
-	/**
-	 * Find all EJB projects for a particular EAR Nature.
-	 * 
-	 * @return a vector of EJBNatureRuntimes.
-	 * @deprecated use getEJBProjectsFromEAR(IProject, String)
-	 */
-	public static Vector getEJBProjects(EARNatureRuntime ear) {
-		Vector ejbs = new Vector();
-		Iterator earProjects = ear.getModuleProjects().values().iterator();
-
-		while (earProjects.hasNext()) {
-			Object object = earProjects.next();
-
-			if (object != null) {
-				J2EENature j2eeNature = (J2EENature) object;
-
-				if (j2eeNature instanceof EJBNatureRuntime) {
-					ejbs.add(j2eeNature);
-				}
-			}
-		}
-
-		return ejbs;
-	}
-	
-	/**
-	 * TODO: implement
-	 * @param project
-	 * @param componentName
-	 * @return
-	 */
-	public static IProject[] getEJBProjectsFromEAR(IProject project, String componentName){
-		
-		return null;
-	}
-
-	/**
-	 * Find all Web projects for a particular EAR Nature.
-	 * 
-	 * @return a vector of J2EEWebNatureRuntimes.
-	 * 
-	 * @deprecated use getWebProjectsFromEAR(IProject, String)
-	 * 			!! not used; to be deleted
-	 */
-	public static Vector getWebProjects(EARNatureRuntime ear) {
-		Vector webProjects = new Vector();
-		Iterator earProjects = ear.getModuleProjects().values().iterator();
-
-		while (earProjects.hasNext()) {
-			Object object = earProjects.next();
-
-			if (object != null) {
-				J2EENature j2eeNature = (J2EENature) object;
-
-				if (j2eeNature instanceof J2EEWebNatureRuntime) {
-					webProjects.add(j2eeNature);
-				}
-			}
-		}
-
-		return webProjects;
-	}
-
-
-	/**
-	 * @return returns a list of projects names for a given ear.
-	 * @deprecated use getEJBProjectFromEAR(IProject, String)
-	 * 	!! not used; to be deleted
-	 */
-	public static String[] getEJBProjectNames(EARNatureRuntime ear) {
-		Vector ejbNatures = getEJBProjects(ear);
-		String[] ejbProjectNames = new String[ejbNatures.size()];
-
-		for (int index = 0; index < ejbProjectNames.length; index++) {
-			ejbProjectNames[index] = ((EJBNatureRuntime) (ejbNatures
-					.elementAt(index))).getProject().getName();
-		}
-
-		return ejbProjectNames;
-	}
-
-
-	
-	/**
-	 * 
-	 * @param jar
-	 * @return  Vector of bean String names.
-	 */
-	public static Vector getBeanNames(EJBJar jar) {
-		// We currently only support Stateless session beans.
-		// List cmpBeans = jar.getBeanManagedBeans();
-		// List bmpBeans = jar.getContainerManagedBeans();
-		List sessionBeans = jar.getSessionBeans();
-
-		Vector names = new Vector();
-
-		// getBeanNames( names, cmpBeans );
-		// getBeanNames( names, bmpBeans );
-		getBeanNames(names, sessionBeans);
-
-		return names;
-	}
-
-	/**
-	 * @param names
-	 *            specifies that vector of strings that will be used to add bean
-	 *            names to.
-	 * @param beans
-	 *            specifies a list of beans.
-	 */
-	private static void getBeanNames(Vector names, List beans) {
-		Iterator iterator = beans.iterator();
-
-		while (iterator.hasNext()) {
-			EnterpriseBean bean = (EnterpriseBean) (iterator.next());
-
-			if (bean.isSession()) {
-				Session sessionBean = (Session) bean;
-
-				if (sessionBean.getSessionType().getValue() == SessionType.STATELESS) {
-					names.add(bean.getName());
-				}
-			}
-		}
-	}
-
-	/**
-	 * Uses emg ProjectUtilities to get the project
-	 * @param ejb eObject
-	 * @return IProject
-	 */
-	public static IProject getProjectFromEJB(EnterpriseBean ejb) {
-		return ProjectUtilities.getProject(ejb);
-	}
-
-	/**
-	 * Get an array of IProject, given a Vector of J2EENature's
-	 * 
-	 * @deprecated pls request a new method if necessary
-	 */
-	public static IProject[] getIProjectsFromJ2EENatures(Vector j2eenatureVector) {
-		IProject[] projects = new IProject[j2eenatureVector == null
-				? 0
-				: j2eenatureVector.size()];
-		Enumeration e = j2eenatureVector.elements();
-		int i = 0;
-		while (e.hasMoreElements()) {
-			J2EENature nature = (J2EENature) e.nextElement();
-			IProject project = nature.getProject();
-			projects[i] = project;
-			i++;
-		}
-
-		return projects;
-	}
-	
-	/**
-	 * 
-	 * @return
-	 */
-	public static String[] getAllEARComponents() {
-		Vector v = new Vector();
-		IProject[] projects = ResourceUtils.getWorkspaceRoot().getProjects();
-		for (int i = 0; i < projects.length; i++) {
-			try {
-				if (ResourceUtils.isEARProject(projects[i])) {
-					v.add(projects[i]);
-				}
-			} catch (Exception e) {
-				e.printStackTrace();
-				//handle exception
-			}
-
-		}
-		String[] earProjects = new String[v.size()];
-		v.copyInto(earProjects);
-		return earProjects;
-	}
-
-
-	/**
-	 * Get a J2EE 1.2 EAR Project. Returns null if no J2EE 1.2 EAR Projects
-	 * exist
-	 * 
-	 * @deprecated  use getDefault12EARProject()
-	 */
-	public static EARNatureRuntime get12EAR() {
-		try {
-			IProject[] allEARs = getEARProjects();
-			for (int i = 0; i < allEARs.length; i++) {
-				// return the first 1.2 EAR encountered
-				EARNatureRuntime thisEAR = (EARNatureRuntime) (allEARs[i]
-						.getNature(IEARNatureConstants.NATURE_ID));
-				if (thisEAR.getJ2EEVersion() == J2EEVersionConstants.J2EE_1_2_ID) {
-					return thisEAR;
-				}
-			}
-		} catch (CoreException ce) {
-			// handle exception
-		}
-		return null;
-
-	}
-	
-	/**
-	 *  Returns the first j2ee 1.2 EAR project in the workspace
-	 * @return null if no 1.2 EAR projects
-	 * 
-	 * @deprecated -  if not used; to be deleted
-	 */
-	public static IProject getDefault12EARProject(){
-		try{
-			IProject[] allEARs = ResourceUtils.getWorkspaceRoot().getProjects(); // getEARProjects();
-			for (int i=0;i<allEARs.length;i++){
-				// return the first 1.2 EAR project
-				IProject ear = allEARs[i];
-				if (getJ2EEVersionAsString(ear).equals(IModuleConstants.J2EE_VERSION_1_2)){
-					return ear;
-				}
-			}
-		}
-		catch(Exception e){
-			e.printStackTrace();
-			//handle exception
-		}
-		return null;
-	}
-	
-		
-	/**
-	 * Get a J2EE 1.3 EAR Project. Returns null if no J2EE 1.3 EAR Projects
-	 * exist
-	 * 
-	 * @deprecated use getDefault13EARComponent()
-	 * 
-	 */
-	public static EARNatureRuntime get13EAR() {
-		try {
-			IProject[] allEARs = getEARProjects();
-			for (int i = 0; i < allEARs.length; i++) {
-				// return the first 1.3 EAR encountered
-				EARNatureRuntime thisEAR = (EARNatureRuntime) (allEARs[i]
-						.getNature(IEARNatureConstants.NATURE_ID));
-				if (thisEAR.getJ2EEVersion() == J2EEVersionConstants.J2EE_1_3_ID) {
-					return thisEAR;
-				}
-			}
-		} catch (CoreException ce) {
-			return null;
-		}
-		return null;
-
-	}
-
-	/**
-	 * Returns a default J2EE 1.3 EAR component in the workspace
-	 * @return EAR component name
-	 */
-	public static String getDefault13EARComponent(){
-		String earComponentName = null;
-		boolean found = false;
-		IProject[] projects = ResourceUtils.getWorkspaceRoot().getProjects();
-		for (int i=0;i<projects.length;i++){
-			 String[] earComponents = getEARComponents(projects[i]);
-			 for (int j=0;j<earComponents.length;j++){
-				 int j2eeVersion = getJ2EEVersion(projects[i], earComponents[j]);
-				 if (j2eeVersion == J2EEVersionConstants.J2EE_1_3_ID) {
-					 return earComponents[j];
-				 }
-			 }
-		}
-		return earComponentName;
-	}
-	
-	/**
-	 * Returns a default J2EE 1.4 EAR component in the workspace
-	 * @return EAR component name
-	 */
-	public static String getDefault14EARComponent(){
-		String earComponentName = null;
-		boolean found = false;
-		IProject[] projects = ResourceUtils.getWorkspaceRoot().getProjects();
-		for (int i=0;i<projects.length;i++){
-			 String[] earComponents = getEARComponents(projects[i]);
-			 for (int j=0;j<earComponents.length;j++){
-				 int j2eeVersion = getJ2EEVersion(projects[i], earComponents[j]);
-				 if (j2eeVersion == J2EEVersionConstants.J2EE_1_4_ID) {
-					 return earComponents[j];
-				 }
-			 }
-		}
-		return earComponentName;
-	}
-		
-	/**
-	 * 
-	 * @param versionId
-	 * @return
-	 * 
-	 * @deprecated use getEARProjectOfVersion(int)
-	 */
-	public static EARNatureRuntime getEAR(int versionId) {
-		try {
-			IProject[] allEARs = getEARProjects();
-			for (int i = 0; i < allEARs.length; i++) {
-				EARNatureRuntime thisEAR = (EARNatureRuntime) (allEARs[i]
-						.getNature(IEARNatureConstants.NATURE_ID));
-				if (thisEAR.getJ2EEVersion() == versionId) {
-					return thisEAR;
-				}
-			}
-		} catch (CoreException ce) {
-			// handle exception
-		}
-		return null;
-	}
-	
-	public static String getEARComponentofJ2EEVersion(int versionId){
-		
-		return null;
-	}
-	
-	/**
-	 * Returns the first EAR project of a given version id
-	 * @param versionId
-	 * @return
-	 * @deprecated // use getEARComponentofJ2EEVersion
-	 */
-	public static IProject getEARProjectOfVersion(int versionId){
-		try {
-			IProject[] allEARs = getEARProjects();
-			for (int i = 0; i < allEARs.length; i++) {
-				IProject ear = allEARs[i];
-				if (getJ2EEVersion(ear) == versionId) {
-					return ear;
-				}
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return null;		
-	}
-
-
-	/**
-	 * 
-	 * @param j2eeVersionInt
-	 * @return
-	 */
-	public static String getLabelFromJ2EEVersion(String j2eeVersionInt) {
-		if (j2eeVersionInt == null || j2eeVersionInt.length() == 0)
-			return "";
-
-		int j2eeVersion = Integer.parseInt(j2eeVersionInt);
-		switch (j2eeVersion) {
-			case J2EEVersionConstants.J2EE_1_2_ID :
-				return J2EEVersionConstants.VERSION_1_2_TEXT;
-			case J2EEVersionConstants.J2EE_1_3_ID :
-				return J2EEVersionConstants.VERSION_1_3_TEXT;
-			case J2EEVersionConstants.J2EE_1_4_ID :
-				return J2EEVersionConstants.VERSION_1_4_TEXT;
-			default :
-				System.out.println("This is not a J2EE version!!");
-				return "";
-		}
-	}
-
-	public static String getJ2EEVersionFromLabel(String j2eeLabel) {
-		String j2ee12String = String.valueOf(J2EEVersionConstants.J2EE_1_2_ID);
-		String j2ee13String = String.valueOf(J2EEVersionConstants.J2EE_1_3_ID);
-		String j2ee14String = String.valueOf(J2EEVersionConstants.J2EE_1_4_ID);
-		if (j2eeLabel.equals(J2EEVersionConstants.VERSION_1_2_TEXT))
-			return j2ee12String;
-
-		if (j2eeLabel.equals(J2EEVersionConstants.VERSION_1_3_TEXT))
-			return j2ee13String;
-
-		if (j2eeLabel.equals(J2EEVersionConstants.VERSION_1_4_TEXT))
-			return j2ee14String;
-
-		return "";
-
-	}
-
-	// ----------------------------------------------------------------------
-
-	/**
-	 * Return all the ear projects in which this project is a nested module;
-	 * 
-	 * @param project
-	 *            The project
-	 * @return EARs EAR projects, possibly null
-	 * 
-	 * @deprecated
-	 *   This method has too much complexity; to be simplified
-	 */
-	public static EARNatureRuntime[] getEARProjects(IProject serviceProject,
-			IServer server) {
-
-	
-		EARNatureRuntime[] earProjects = null;
-		EARNatureRuntime ear = null;
-		IProject earProject = null;
-
-		if (serviceProject != null && serviceProject.exists()) {
-			try {
-
-				EARNatureRuntime[] ears = null;
-				boolean isWebEJBOrAppClient = ResourceUtils.isWebProject(serviceProject) //serviceProject.hasNature(IWebNatureConstants.J2EE_NATURE_ID)
-						||  ResourceUtils.isEJBProject(serviceProject) //serviceProject.hasNature(IEJBNatureConstants.NATURE_ID)
-						||  ResourceUtils.isAppClientProject(serviceProject);//serviceProject.hasNature(IApplicationClientNatureConstants.NATURE_ID);
-				if (!isWebEJBOrAppClient) {
-					return null;
-				}
-
-				ears = J2EEProjectUtilities.getReferencingEARProjects(serviceProject);
-
-				// separate EARs which are already deployed to the existing
-				// server
-				if (ears != null && ears.length >= 1) {
-					ArrayList preferredEARList = new ArrayList();
-					ArrayList secondaryEARList = new ArrayList();
-					for (int i = 0; i < ears.length; i++) {
-						ear = ears[i];
-						earProject = ear.getProject();
-						IModule module = ResourceUtils.getModule(earProject);
-						if (module != null) {
-							if (server != null
-									|| ServerUtil.containsModule(server,
-											module, new NullProgressMonitor())) {
-								preferredEARList.add(ear);
-							} else {
-								secondaryEARList.add(ear);
-							}
-						}
-					}
-					// add secondaryEARList items to end of primary list
-					for (int j = 0; j < secondaryEARList.size(); j++) {
-						preferredEARList.add(secondaryEARList.get(j));
-					}
-					// toArray
-					if (preferredEARList != null) {
-						earProjects = (EARNatureRuntime[]) preferredEARList
-								.toArray(new EARNatureRuntime[0]);
-					}
-				}
-			} catch (Exception ce) {
-				Log log = new EclipseLog();
-				log.log(Log.ERROR, 5039, J2EEUtils.class, "getEARProjects", ce);
-
-			}
-		}
-		return earProjects;
-	}
-
-	/**
-	 * 
-	 * @return
-	 * 
-	 * @deprecated  // use getALLEARComponents
-	 */
-	public static IProject[] getEARProjects() {
-		Vector v = new Vector();
-		IProject[] projects = ResourceUtils.getWorkspaceRoot().getProjects();
-		for (int i = 0; i < projects.length; i++) {
-			try {
-//				if (projects[i].hasNature(IEARNatureConstants.NATURE_ID)) {
-				if (ResourceUtils.isEARProject(projects[i])) {
-					v.add(projects[i]);
-				}
-			} catch (Exception e) {
-				e.printStackTrace();
-				//handle exception
-			}
-
-		}
-		IProject[] earProjects = new IProject[v.size()];
-		v.copyInto(earProjects);
-		return earProjects;
-	}
-	
-	
-	/**
-	 * Returns the first EAR project associated with the project and server
-	 * @param serviceProject
-	 * @param server
-	 * @return
-	 * 
-	 * @deprecated  // to be simplified
-	 */
-	public static IProject getDefaultEARProject(IProject serviceProject, IServer server) {
-
-		IProject[] earProjects = null;
-		IProject ear = null;
-
-		if (serviceProject != null && serviceProject.exists()) {
-			try {
-
-				boolean isWebEJBOrAppClient = ResourceUtils.isWebProject(serviceProject) //serviceProject.hasNature(IWebNatureConstants.J2EE_NATURE_ID)
-						||  ResourceUtils.isEJBProject(serviceProject) //serviceProject.hasNature(IEJBNatureConstants.NATURE_ID)
-						||  ResourceUtils.isAppClientProject(serviceProject);//serviceProject.hasNature(IApplicationClientNatureConstants.NATURE_ID);
-				if (!isWebEJBOrAppClient) {
-					return null;
-				}
-
-				IProject[] ears = getEARProjects();
-
-				// separate EARs which are already deployed to the existing
-				// server
-				if (ears != null && ears.length >= 1) {
-					ArrayList preferredEARList = new ArrayList();
-					ArrayList secondaryEARList = new ArrayList();
-					for (int i = 0; i < ears.length; i++) {
-						ear = ears[i];
-						IModule module = ResourceUtils.getModule(ear);
-						if (module != null) {
-							if (server != null
-									|| ServerUtil.containsModule(server,
-											module, new NullProgressMonitor())) {
-								preferredEARList.add(ear);
-							} else {
-								secondaryEARList.add(ear);
-							}
-						}
-					}
-					// add secondaryEARList items to end of primary list
-					for (int j = 0; j < secondaryEARList.size(); j++) {
-						preferredEARList.add(secondaryEARList.get(j));
-					}
-					// toArray
-					if (preferredEARList != null) {
-						earProjects = (IProject[]) preferredEARList.toArray(new IProject[0]);
-					}
-				}
-			} catch (Exception ce) {
-				Log log = new EclipseLog();
-				log.log(Log.ERROR, 5039, J2EEUtils.class, "getEARProjects", ce);
-
-			}
-		}
-		return earProjects[0];
-	}
-	
-	/**
-	 * Returns EJB projects in the ears
-	 * 
-	 * @param earProjects
-	 * @return projects EJB projects
-	 * 
-	 * @deprecated use getEJB20ComponentsFromEars
-	 */
-	public static IProject[] getEJB2_0ProjectsFromEARS(EARNatureRuntime[] earProjects) {
-		if (earProjects == null)
-			return null;
-
-		ArrayList ejbProjects = new ArrayList();
-		for (int i = 0; i < earProjects.length; i++) {
-			if (earProjects[i] instanceof EARNatureRuntime) {
-				EARNatureRuntime ear = (EARNatureRuntime) earProjects[i];
-				Map projectsInEAR = ear.getModuleProjects();
-				if (projectsInEAR != null && !projectsInEAR.isEmpty()) {
-					Iterator iter = projectsInEAR.values().iterator();
-					while (iter.hasNext()) {
-						Object MOFObject = iter.next();
-						if (MOFObject instanceof EJBNatureRuntime) {
-							if (((EJBNatureRuntime) MOFObject)
-									.getModuleVersion() >= J2EEVersionConstants.EJB_2_0_ID) {
-								IProject project = ((EJBNatureRuntime) MOFObject)
-										.getProject();
-								if (project != null) {
-									ejbProjects.add(project);
-								}
-							}
-						}
-					}
-				}
-			}
-		} // end for earProjects loop
-
-		return (IProject[]) ejbProjects.toArray(new IProject[0]);
-	}
-	
-	public static String[] getEJB20ComponentsFromEars(String[] earComponentNames){
-		
-		return null;
-	}
-
-	/**
-	 * Returns EJB projects in the ears
-	 * 
-	 * @param earProjects
-	 * @return projects EJB projects
-	 * 
-	 * @deprecated
-	 */
-	public static IProject[] getEJBProjectsFromEARS(
-			EARNatureRuntime[] earProjects) {
-		if (earProjects == null)
-			return null;
-
-		ArrayList ejbProjects = new ArrayList();
-		for (int i = 0; i < earProjects.length; i++) {
-			if (earProjects[i] instanceof EARNatureRuntime) {
-				EARNatureRuntime ear = (EARNatureRuntime) earProjects[i];
-				Map projectsInEAR = ear.getModuleProjects();
-				if (projectsInEAR != null && !projectsInEAR.isEmpty()) {
-					Iterator iter = projectsInEAR.values().iterator();
-					while (iter.hasNext()) {
-						Object MOFObject = iter.next();
-						if (MOFObject instanceof EJBNatureRuntime) {
-
-							IProject project = ((EJBNatureRuntime) MOFObject)
-									.getProject();
-							if (project != null) {
-								ejbProjects.add(project);
-							}
-
-						}
-					}
-				}
-			}
-		} // end for earProjects loop
-
-		return (IProject[]) ejbProjects.toArray(new IProject[0]);
-	}
-
-	/**
-	 * 
-	 * @param earComponents
-	 * @return
-	 */
-	public static IVirtualComponent[] getEJBComponentsFromEars(IVirtualComponent[] earComponents){
-		
-		return null;
-	}
-	
-	
-	/**
-	 * Utility method to combine two IProject[]
-	 * @param projectArray1
-	 * @param projectArray2
-	 * @return
-	 */
-	public static IProject[] combineProjectArrays(IProject[] projectArray1,
-			IProject[] projectArray2) {
-
-		// check if either or both arrays are null.
-		if (projectArray1 == null && projectArray2 == null)
-			return null;
-		else if (projectArray1 != null && projectArray2 == null)
-			return projectArray1;
-		else if (projectArray1 == null && projectArray2 != null)
-			return projectArray2;
-
-		IProject[] combinedProjects = new IProject[projectArray1.length
-				+ projectArray2.length];
-
-		System.arraycopy(projectArray1, 0, combinedProjects, 0,
-				projectArray1.length);
-		if (projectArray2.length > 0) {
-			System.arraycopy(projectArray2, 0, combinedProjects,
-					projectArray1.length, projectArray2.length);
-		}
-
-		return combinedProjects;
-	}
-
-	/**
-	 * Returns all Web projects in the ear(s)
-	 * 
-	 * @param earProjects
-	 * @return projects Web projects
-	 * @deprecated  use getWebComponentsForEars
-	 */
-	public static IProject[] getWebProjectsFromEARS(
-			EARNatureRuntime[] earProjects) {
-		if (earProjects == null)
-			return null;
-
-		ArrayList webProjects = new ArrayList();
-		for (int i = 0; i < earProjects.length; i++) {
-			if (earProjects[i] instanceof EARNatureRuntime) {
-				EARNatureRuntime ear = (EARNatureRuntime) earProjects[i];
-				Map projectsInEAR = ear.getModuleProjects();
-				if (projectsInEAR != null && !projectsInEAR.isEmpty()) {
-					Iterator iter = projectsInEAR.values().iterator();
-					while (iter.hasNext()) {
-						// IProjectNature nature =
-						// iter.next().getNature(IWebNatureConstants.J2EE_NATURE_ID);
-						Object MOFObject = iter.next();
-						if (MOFObject instanceof J2EEWebNatureRuntime) {
-							IProject project = ((J2EEWebNatureRuntime) MOFObject)
-									.getProject();
-							if (project != null) {
-								webProjects.add(project);
-							}
-
-						}
-					}
-				}
-			}
-		} // end for earProjects loop
-
-		return (IProject[]) webProjects.toArray(new IProject[0]);
-	}
-
-	/**
-	 * 
-	 * @param earComponents
-	 * @return
-	 */
-	public static IVirtualComponent[] getWebComponentsForEars(IVirtualComponent earComponents){
-		
-		return null;
-	}
-	
-	/**
-	 * 
-	 * @param project
-	 * @return
-	 * 
-	 * @deprecated // use isEJB20Component
-	 */
-	public static boolean isEJB2_0Project(IProject project) {
-
-		if (ResourceUtils.isEJBProject(project)) {
-			try {
-
-				if (project.hasNature(IEJBNatureConstants.NATURE_ID)
-						&& EJBNatureRuntime.getRuntime(project)
-								.getModuleVersion() >= J2EEVersionConstants.EJB_2_0_ID) {
-					return true;
-				}
-			} catch (CoreException e) {
-			}
-		}
-		return false;
-	}
-	
-	/**
-	 * 
-	 * @param ejbComponent
-	 * @return
-	 */
-	public static boolean isEJB20Component(IVirtualComponent ejbComponent){
-		
-		return false;
-	}
-
-	/**
-	 * Returns true if the given <code>project</code> is an EAR 1.2 or EAR 1.3
-	 * Project.
-	 * 
-	 * @param project
-	 *            The project.
-	 * @return True if the project is an EAR 1.2 or an EAR 1.3 Project.
-	 * 
-	 * @deprecated // use isEARComponent
-	 */
-	public static boolean isEARProject(IProject project) {
-		try {
-			if (project.hasNature(IEARNatureConstants.NATURE_ID))
-				return true;
-		} catch (CoreException e) {
-		}
-		return false;
-	}
-
-	/**
-	 * 
-	 * @param module
-	 * @param EAR
-	 * @return
-	 * 
-	 * @deprecated   use isComponentAssociated
-	 */
-	public static boolean isEARAssociated(IProject module, IProject EAR) {
-
-		EARNatureRuntime[] ears = getEARProjects(module);
-		if (ears != null && ears.length != 0) {
-			Vector EARNames = new Vector();
-			for (int i = 0; i < ears.length; i++) {
-				EARNames.add(ears[i].getProject().getName());
-			}
-			String[] earNames = (String[]) EARNames.toArray(new String[0]);
-			if (Arrays.binarySearch(earNames, EAR.getName()) >= 0) {
-				return true;
-			}
-		}
-		return false;
-	}
-	
-	/**
-	 * 
-	 * @param ear
-	 * @param component
-	 * @return
-	 */
-	public static boolean isComponentAssociated(IVirtualComponent ear, IVirtualComponent component){
-		
-		return false;
-	}
-
-	/**
-	 * 
-	 * @param module
-	 * @param EARProject
-	 * 
-	 * @deprecated new method to be determined
-	 */
-	public static void associateWebProject(IProject module, IProject EARProject) {
-		try {
-
-			String uri = module.getName() + ".war";
-			String contextRoot = module.getName();
-			AddModuleToEARProjectCommand amiec = new AddModuleToEARProjectCommand(
-					module, EARProject, uri, contextRoot, null);
-			if (amiec.canExecute())
-				amiec.execute();
-			/*
-			 * EARNatureRuntime EARNature =
-			 * (EARNatureRuntime)getEARNatureRuntimeFromProject(EARProject);
-			 * 
-			 * Application application = EARNature.getApplication(); Module mod =
-			 * (Module)application.getFirstModule(module.getName());
-			 * EAREditModel edm = EARNature.getEarEditModelForRead();
-			 * edm.addModuleMapping(mod, EARProject); edm.releaseAccess();
-			 * 
-			 */
-		} catch (Exception e) {
-
-		}
-	}
-
-	/**
-	 * 
-	 * @param ejbProject
-	 * @param EARProject
-	 * 
-	 * @deprecated to be determined
-	 */
-	public static void associateEJBProject(IProject ejbProject,
-			IProject EARProject) {
-		try {
-			String uri = ejbProject.getName() + ".jar";
-			String contextRoot = ejbProject.getName();
-			AddModuleToEARProjectCommand amiec = new AddModuleToEARProjectCommand(
-					ejbProject, EARProject, uri, contextRoot, null);
-			if (amiec.canExecute())
-				amiec.execute();
-
-		} catch (Exception e) {
-
-		}
-
-	}
-	
-	/**
-	 * Returns the first Module's WEB-INF directory
-	 * @param project
-	 * @return
-	 * 
-	 * @deprecated  use getWebInfPath(project, compName) instead
-	 */
-	public static IPath getFirstWebInfPath(IProject project){
-		IPath modulePath = null;
-		StructureEdit mc = null;
-		try {
-		  mc = StructureEdit.getStructureEditForRead(project);
-		  WorkbenchComponent[] wbcs = mc.getWorkbenchModules();
-		  
-		  if (wbcs.length!=0) {
-//			WebArtifactEdit webEdit = null;
-//			try {
-//			  webEdit = WebArtifactEdit.getWebArtifactEditForRead(wbcs[0]);
-//			  if (webEdit!=null){
-//				  IPath webXMLPath = webEdit.getDeploymentDescriptorPath();
-//				  modulePath = webXMLPath.removeLastSegments(1);
-//				  System.out.println("WebModulePath/DDPath = "+modulePath);
-//			  }
-//			}
-//			finally{
-//				if (webEdit!=null)
-//					webEdit.dispose();
-//			}
-			IVirtualComponent component = ComponentCore.createComponent(project, wbcs[0].getName());
-			IVirtualFolder webInfDir = component.getFolder(new Path("/WEB-INF"));
-			modulePath = webInfDir.getWorkspaceRelativePath();
-			System.out.println("FirstWebInfPath = " +modulePath);
-		  }
-		}
-		catch(Exception ex){}
-		finally{
-			if (mc!=null)
-				mc.dispose();
-		}
-
-		return modulePath;		
-	}
-	
-	/**
-	 * TODO: to be implemented
-	 * @param project
-	 * @param componentName
-	 * @return
-	 */
-	public static IPath getWebInfPath(IProject project, String componentName){
-		
-		IVirtualComponent component = ComponentCore.createComponent(project, componentName);
-		IVirtualFolder webInfDir = component.getFolder(new Path("/WEB-INF"));
-		IPath modulePath = webInfDir.getWorkspaceRelativePath();
-		System.out.println("FirstWebInfPath = " +modulePath);
-		
-		return modulePath;
-	}
-	
-	
-	/**
-	 * 
-	 * @param project
-	 * @return
-	 * 
-	 * @deprecated use getWebContentPath(IProject, String)
-	 */
-	public static IPath getFirstWebContentPath(IProject project){
-		
-		IPath modulePath = null;
-		StructureEdit mc = null;
-		try {
-		  mc = StructureEdit.getStructureEditForRead(project);
-		  WorkbenchComponent[] wbcs = mc.getWorkbenchModules();
-		  if (wbcs.length!=0) {
-//			WebArtifactEdit webEdit = null;
-//			try {
-//			  webEdit = WebArtifactEdit.getWebArtifactEditForRead(wbcs[0]);
-//			  if (webEdit!=null){
-//				  IPath webXMLPath = webEdit.getDeploymentDescriptorPath();
-//				  modulePath = webXMLPath.removeLastSegments(2);
-//				  System.out.println("WebContent Path = "+modulePath);
-//			  }
-//			}
-//			finally{
-//				if (webEdit!=null)
-//					webEdit.dispose();
-//			}
-			IVirtualComponent component = ComponentCore.createComponent(project, wbcs[0].getName());
-			modulePath = component.getWorkspaceRelativePath();
-			System.out.println("FirstWebContentPath = " +modulePath);
-		  }
-		}
-		catch(Exception ex){}
-		finally{
-			if (mc!=null)
-				mc.dispose();
-		}
-
-		return modulePath;			
-	}
-	
-	/**
-	 * TODO: implement
-	 * @param project
-	 * @param componentName
-	 * @return
-	 */
-	public static IPath getWebContentPath(IProject project, String componentName){
-		
-		IVirtualComponent component = ComponentCore.createComponent(project, componentName);
-		IPath modulePath = component.getWorkspaceRelativePath();
-		System.out.println("FirstWebContentPath = " +modulePath);
-		
-		return modulePath;
-	}
-	
-	/**
-	 * 
-	 * @param project
-	 * @return
-	 * 
-	 * @deprecated use getWebContentContainer(IProject, String)
-	 */
-	public static IContainer getFirstWebContentContainer(IProject project){
-		IContainer container = null;
-		IPath modulePath = getFirstWebContentPath(project);
-		IResource res = ResourceUtils.findResource(modulePath);
-		if (res!=null){
-		  container = res.getParent();
-		}		
-		  
-		return container;
-	}
-	
-	/**
-	 * TODO: implement
-	 * @param project
-	 * @param componentName
-	 * @return
-	 */
-	public static IContainer getWebContentContainer(IProject project, String componentName){
-		IContainer container = null;
-		IPath modulePath = getWebContentPath(project, componentName);
-		IResource res = ResourceUtils.findResource(modulePath);
-		if (res!=null){
-		  container = res.getParent();
-		}		
-		  
-		return container;
-	}
-	
-	
-	/**
-	 * Returns the first Module name 
-	 * @param project
-	 * @return
-	 * 
-	 * @deprecated  not necessary; to be deleted
-	 */
-	public static String getFirstWebModuleName(IProject project){
-		String moduleName = null;
-		StructureEdit mc = null;
-		try {
-		  mc = StructureEdit.getStructureEditForRead(project);
-		  WorkbenchComponent[] wbcs = mc.getWorkbenchModules();
-		  if (wbcs.length!=0) {
-			  moduleName = wbcs[0].getName();
-			  System.out.println("First Module name = "+moduleName);
-		  }
-		}
-		catch(Exception ex){}
-		finally{
-			if (mc!=null)
-				mc.dispose();
-		}
-
-		return moduleName;				
-	}
-	
-
-	/**
-	 * True if the component is a valid Web component
-	 * @param project
-	 * @param componentName
-	 * @return
-	 */
-	public static boolean isWebComponent(IProject project, String componentName) {
-		boolean isWeb = false;
-		StructureEdit mc = null;
-		try {
-		  mc = StructureEdit.getStructureEditForRead(project);
-		  WorkbenchComponent[] wbcs = mc.getWorkbenchModules();
-		  for(int i=0;i<wbcs.length;i++){
-			  if (wbcs[i].getName().equals(componentName)){
-				  isWeb = WebArtifactEdit.isValidWebModule(wbcs[i]);
-				  break;
-			  }
-		  }
-		}
-		catch(Exception e){
-			e.printStackTrace();
-			// handle Unresolveable URI exception
-		}
-		finally{
-			if (mc!=null)
-				mc.dispose();
-		}
-
-		return isWeb;
-	}
-	
-	public static boolean isWebComponent(IVirtualComponent comp){
-		return isWebComponent(comp.getProject(), comp.getName());
-	}
-
-	/**
-	 * True is the component is a valid EAR component
-	 * @param project
-	 * @param componentName
-	 * @return
-	 */
-	public static boolean isEARComponent(IProject project, String componentName){
-		boolean isEAR = false;
-		StructureEdit mc = null;
-		try {
-		  mc = StructureEdit.getStructureEditForRead(project);
-		  WorkbenchComponent[] wbcs = mc.getWorkbenchModules();
-		  for(int i=0;i<wbcs.length;i++){
-			  if (wbcs[i].getName().equals(componentName)){
-				  isEAR = EARArtifactEdit.isValidEARModule(wbcs[i]);
-				  break;
-			  }
-		  }
-		}
-		catch(Exception ex){}
-		finally{
-			if (mc!=null)
-				mc.dispose();
-		}
-		
-		return isEAR;
-	}
-	
-	public static boolean isEARComponent(IVirtualComponent comp){
-		return isEARComponent(comp.getProject(), comp.getName());
-	}
-
-	/**
-	 * True if the component is a valid EJB component
-	 * @param project
-	 * @param componentName
-	 * @return
-	 */
-	public static boolean isEJBComponent(IProject project, String componentName) {
-		boolean isEJB = false;
-		StructureEdit mc = null;
-		try {
-		  mc = StructureEdit.getStructureEditForRead(project);
-		  WorkbenchComponent[] wbcs = mc.getWorkbenchModules();
-		  for(int i=0;i<wbcs.length;i++){
-			  if (wbcs[i].getName().equals(componentName)){
-				  isEJB = EJBArtifactEdit.isValidEJBModule(wbcs[i]);
-				  break;
-			  }
-		  }
-		}
-		catch(Exception ex){}
-		finally{
-			if (mc!=null)
-				mc.dispose();
-		}
-		
-		return isEJB;	
-	}
-
-	public static boolean isEJBComponent(IVirtualComponent comp){
-		return isEJBComponent(comp.getProject(), comp.getName());
-	}
-	
-	/**
-	 * True if the component is a true Application client component
-	 * @param project
-	 * @param componentName
-	 * @return
-	 */
-	public static boolean isAppClientComponent(IProject project, String componentName) {
-		boolean isAppClient = false;
-		StructureEdit mc = null;
-		try {
-		  mc = StructureEdit.getStructureEditForRead(project);
-		  WorkbenchComponent[] wbcs = mc.getWorkbenchModules();
-		  for(int i=0;i<wbcs.length;i++){
-			  if (wbcs[i].getName().equals(componentName)){
-				  isAppClient = AppClientArtifactEdit.isValidApplicationClientModule(wbcs[i]);
-				  break;
-			  }
-		  }
-		}
-		catch(Exception ex){}
-		finally{
-			if (mc!=null)
-				mc.dispose();
-		}
-		
-		return isAppClient;	
-	}	
-
-	public static boolean isAppClientComponent(IVirtualComponent comp){
-		return isAppClientComponent(comp.getProject(), comp.getName());
-	}
-	
-	/**
-	 * True if the component is a valid Java component
-	 * @param project
-	 * @param componentName
-	 * @return
-	 */
-	public static boolean isJavaComponent(IProject project, String componentName) {
-		boolean isJava = false;
-		StructureEdit mc = null;
-		try {
-		  mc = StructureEdit.getStructureEditForRead(project);
-		  WorkbenchComponent[] wbcs = mc.getWorkbenchModules();
-		  for(int i=0;i<wbcs.length;i++){
-			  if (wbcs[i].getName().equals(componentName)){
-				  isJava = ArtifactEdit.isValidEditableModule(wbcs[i]);
-				  break;
-			  }
-		  }
-		}
-		catch(Exception e){
-			e.printStackTrace();
-			// handle Unresolveable URI exception
-		}
-		finally{
-			if (mc!=null)
-				mc.dispose();
-		}
-
-		return isJava;
-	}
-	
-	public static boolean isJavaComponent(IVirtualComponent comp){
-		return isJavaComponent(comp.getProject(), comp.getName());
-	}	
-	
-	
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/JavaMOFUtils.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/JavaMOFUtils.java
deleted file mode 100644
index aa8cdbd..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/JavaMOFUtils.java
+++ /dev/null
@@ -1,226 +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.common;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jem.internal.plugin.JavaEMFNature;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaVisibilityKind;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jem.java.impl.JavaClassImpl;
-
-/**
-* This class contains some useful utilities for dealing with the JavaMOF
-*/
-
-public final class JavaMOFUtils
-{
- /**
-  * Determine whether this class of the given name is loadable in the given
-  * project.
-  * @param className The fully qualified name of the class
-  * @param project The project
-  * @return True if the class is loadable and no exceptions are thrown. 
-  */
-  public static boolean isClassLoadable(String className, IProject project) throws CoreException
-  {
-   	return isClassLoadable(getJavaClass(className,project));
-  }
-
-  public static boolean isClassLoadable(JavaClass javaClass)
-  {
-	return javaClass.isExistingType();    
-  }
-
-  /**
-  * Determine whether the specified class has a public constructor
-  * with an empty parameter list.
-  * @param className The fully qualified name of the class
-  * @param project The project
-  * @return True if the class is loadable from the project and the 
-  *         class has a public constructor with an empty parameter list  
-  */
-  public static boolean hasPublicDefaultCtor(String className, IProject project) throws CoreException
-  {
-    return hasPublicDefaultCtor(getJavaClass(className, project));
-  }
-
-
- public static boolean hasPublicDefaultCtor(JavaClass javaClass)
-  {
-   
-    List methodList = javaClass.getMethods();
-    if (methodList==null)
-      return true;
-
-    Iterator iMethods = methodList.iterator();
-    boolean userDefinedCtor = false;
-    while (iMethods.hasNext())
-    {
-      Method thisMethod = (Method)iMethods.next();
-
-      if (thisMethod.isConstructor())
-      {
-        userDefinedCtor = true; 
-
-        //Since the user has defined a ctor, the default ctor is no longer available.
-        //We must ensure that the user has provided a public ctor with no parameters.
-
-        //check if public
-        if (thisMethod.getJavaVisibility().getValue() == JavaVisibilityKind.PUBLIC)
-        {
-          //see if parameter list is empty
-          List paramList = thisMethod.getParameters();
-          if (paramList.isEmpty() )
-          {
-	        return true;             
-          }
-        }
-      }
-
-    }
-
-    if (userDefinedCtor)
-    {
-	  return false; //if the user defined a ctor and we still haven't
-	  	            //returned true, none of them were public with no parameters.
-    }
-    else
-    { 
-       return true;    
-    }
-
-  }
-  /**
-  * Determine whether the specified class implements the specified interface.
-  * @param className The fully qualified name of the class
-  * @param interfaceName The fully qualified name of the interface
-  * @param project The project
-  * @return True if the class and interface are loadable from the project and
-  *         the class implements the interface.
-  */
-  public static boolean implementsInterface(String className, String interfaceName, IProject project)
-  			throws CoreException
-  {
-   return implementsInterface(getJavaClass(className, project), getJavaClass(interfaceName, project));
-  }
-
-public static boolean implementsInterface(JavaClass javaClass, JavaClass interfaceClass)
-  {
-   
-    if (!javaClass.isExistingType())     return false;
-
-    if (!interfaceClass.isExistingType())  return false;
-        
-    return javaClass.implementsInterface(interfaceClass);
-  }
-
-  /**
-  * Determine whether the specified class extends the specified superclass
-  * @param className The fully qualified name of the class
-  * @param superClassName The fully qualified name of the superclass
-  * @param project The project
-  * @return True if the class and superClass are loadable from the project and
-  *         the class extends the superClass
-  */
-  public static boolean extendsClass(String className, String superClassName, IProject project)
-         throws CoreException
-  {
-    return extendsClass(getJavaClass(className,project), getJavaClass(superClassName, project));
-  }
-
-  public static boolean extendsClass(JavaClass javaClass, JavaClass superClass)
-  {
-    return superClass.isAssignableFrom(javaClass);
-  }
-
-  /**
-  * Determine whether the specified class is actually an interface
-  * @param className The fully qualified name of the class
-  * @param project The project
-  * @return True if the class is loadable from the project and is 
-  *         actually an interface
-  */
-  public static boolean isInterface(String className, IProject project) throws CoreException
-  {
-     return isInterface(getJavaClass(className, project));
-  }
-
- public static boolean isInterface(JavaClass javaClass)
-  {
-      return javaClass.isInterface();
-  }
- public static boolean hasAbstractMethods (String className, IProject project) throws CoreException
- 	{
-	    return hasAbstractMethods(getJavaClass(className, project));
-  	}
-
-  public static boolean hasAbstractMethods (JavaClass javaClass)
- 	{
-	   List methodList = javaClass.getMethods();
-       if (methodList==null)
-      	return false;
-
-	   Iterator iMethods = methodList.iterator();
-	   while (iMethods.hasNext())
-    	{
-      		Method thisMethod = (Method)iMethods.next();
-			if ( thisMethod.isAbstract()) return true;
-	   	}
-		return false;
- 	}
-
- public static JavaClass getJavaClass(String className , IProject project) throws CoreException
- 	{
- 		JavaEMFNature jMOF = (JavaEMFNature)JavaEMFNature.createRuntime(project);
-    	return  (JavaClass)JavaClassImpl.reflect(className, jMOF.getResourceSet());
- 	}
-
- public static boolean isValidSEIFile(JavaClass beanClass, JavaClass seiClass)
- 	{
- 		if (!seiClass.isInterface())
- 			return false;
-
-		Vector beanMethodsList = new Vector();
- 		List beanMethods = beanClass.getMethods();
-		Iterator beanMethodsIterator = beanMethods.iterator();
-	   	while (beanMethodsIterator.hasNext())
-    	{
-      		Method thisMethod = (Method)beanMethodsIterator.next();
-			beanMethodsList.add(thisMethod.getMethodElementSignature());
-	   	}
-
-		List seiMethods = seiClass.getMethods();
- 		if (beanMethods == null ) {
- 			if ( seiMethods == null) return true;
- 			else	return false;
- 		}
-		if (seiMethods == null) return false;
-
-		Iterator seiMethodsIterator = seiMethods.iterator();
-	   	while (seiMethodsIterator.hasNext())
-    	{
-      		Method thisMethod = (Method)seiMethodsIterator.next();
-			if ( !beanMethodsList.contains(thisMethod.getMethodElementSignature())) {
-				return false;
-			}
-	   	}
-		return true;
- 		
- 	}
- 
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/ResourceUtils.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/ResourceUtils.java
deleted file mode 100644
index e7c1167..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/ResourceUtils.java
+++ /dev/null
@@ -1,2172 +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.common;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.URL;
-import java.net.URLEncoder;
-import java.util.Enumeration;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IContainer;
-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.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaConventions;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.applicationclient.componentcore.util.AppClientArtifactEdit;
-import org.eclipse.jst.j2ee.componentcore.util.EARArtifactEdit;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.componentcore.util.EJBArtifactEdit;
-import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.wst.command.env.core.common.Log;
-import org.eclipse.wst.command.env.eclipse.EclipseLog;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.StructureEdit;
-import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerPort;
-import org.eclipse.wst.server.core.ServerUtil;
-import org.eclipse.wst.server.core.model.IURLProvider;
-
-/**
- * This class contains useful methods for working with Eclipse resources.
- */
-public final class ResourceUtils {
-
-	//
-	// Keeps the IWorkspaceRoot hanging around. See getWorkspaceRoot().
-	//
-	private static IWorkspaceRoot root_ = null;
-
-	//
-	// Keeps the IWorkspace hanging around. See getWorkspace().
-	//
-	private static IWorkspace workspace_ = null;
-
-	/**
-	 * As returned by {@link #getProjectType getProjectType()}, indicates that
-	 * the given project has no Java or Web nature.
-	 */
-	public static byte PROJECT_TYPE_NONE = 0;
-
-	/**
-	 * As returned by {@link #getProjectType getProjectType()}, indicates that
-	 * the given project has a Java project nature.
-	 */
-	public static byte PROJECT_TYPE_JAVA = 1;
-
-	/**
-	 * As returned by {@link #getProjectType getProjectType()}, indicates that
-	 * the given project has a Web project nature.
-	 */
-	public static byte PROJECT_TYPE_WEB = 2;
-
-	/**
-	 * As returned by {@link #getProjectType getProjectType()}, indicates that
-	 * the given project has an EJB project nature.
-	 */
-	public static byte PROJECT_TYPE_EJB = 4;
-	
-	/**
-	 * As returned by {@link #getProjectType getProjectType()}, indicates that
-	 * the given project has an Application client project nature.
-	 */	
-	public static byte PROJECT_TYPE_APPCLIENT = 8;
-
-	/**
-	 * Status Code explaining the CoreException thrown
-	 */
-
-	private static final String ejbProjectNature = IModuleConstants.JST_EJB_MODULE;
-	// ksc private static final String ejb2ProjectNature =
-	// IEJBNatureConstants.EJB_20_NATURE_ID;
-
-	/**
-	 * The SOAP rpcrouter servlet extension to be added to web project URL
-	 */
-	public static String SERVLET_EXT = "/servlet/rpcrouter";
-
-	private static final String DEFAULT_CLIENT_WEB_PROJECT_EXT = "Client";
-	private static final String DEFAULT_EJB_PROJECT_NAME = "WebServiceEJBProject";
-	private static final String DEFAULT_WEB_PROJECT_NAME = "WebServiceProject";
-	private static final String DEFAULT_ROUTER_PROJECT_EXT = "Router";
-
-	private static final String DEFAULT_SERVICE_EAR_PROJECT_NAME = "WebServiceEAR";
-	private static final String DEFAULT_CLIENT_EAR_PROJECT_NAME = "WebServiceClientEAR";
-
-	/**
-	 * 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_;
-	}
-
-	/**
-	 * 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 ResourceUtils.getWorkspaceRoot().findMember(absolutePath);
-	}
-
-	/**
-	 * Validates the given string as a name for a resource of the given type(s).
-	 * This method obeys the contract of
-	 * {@link org.eclipse.core.resources.IWorkspace#validateName IWorkspace.validateName()}.
-	 * 
-	 * @param segment
-	 *            The path to validate.
-	 * @param typeMask
-	 *            The <code>IResource</code> type or types.
-	 * @return The status with a value if <code>IStatus.OK</code> if the path
-	 *         is valid, or with appropriate severity and message information if
-	 *         the path is not valid.
-	 */
-	public static IStatus validateName(String segment, int typeMask) {
-		return ResourcesPlugin.getWorkspace().validateName(segment, typeMask);
-	}
-
-	/**
-	 * Validates the given string as the path of a resource of the given
-	 * type(s). This method obeys the contract of
-	 * {@link org.eclipse.core.resources.IWorkspace#validatePath IWorkspace.validatePath()}.
-	 * 
-	 * @param path
-	 *            The path to validate.
-	 * @param typeMask
-	 *            The <code>IResource</code> type or types.
-	 * @return The status with a value if <code>IStatus.OK</code> if the path
-	 *         is valid, or with appropriate severity and message information if
-	 *         the path is not valid.
-	 */
-	public static IStatus validatePath(String path, int typeMask) {
-		return ResourcesPlugin.getWorkspace().validatePath(path, typeMask);
-	}
-
-	/**
-	 * Validates the given Java type name.
-	 * 
-	 * @param typeName
-	 *            The Java type name.
-	 * @return The status with a value of <code>IStatus.OK</code> if the name
-	 *         is valid, or with appropriate severity and message information if
-	 *         name is not valid. The primitive types (boolean, char, byte,
-	 *         short, int, long, float, double) are valid. Arrays of valid types
-	 *         are themselves valid.
-	 */
-	public static IStatus validateJavaTypeName(String typeName) {
-		//
-		// Strip off the trailing array bits, if any.
-		//
-		int a = typeName.indexOf('[');
-		if (a > 0) {
-			typeName = typeName.substring(0, a);
-		}
-		//
-		// Allow primitives.
-		//
-		if (isPrimitiveJavaType(typeName)) {
-			return new Status(IStatus.OK, WebServicePlugin.ID, 0, "", null);
-		}
-		//
-		// Defer to JavaConventions.
-		//
-		return JavaConventions.validateJavaTypeName(typeName);
-	}
-
-	/**
-	 * Returns true if the given <code>typeName</code> is a Java primitive
-	 * (boolean, char, byte, short, int, long, float, double).
-	 * 
-	 * @return True if the type name is a Java primitive.
-	 */
-	public static boolean isPrimitiveJavaType(String typeName) {
-		return (typeName.equals("boolean") || typeName.equals("char")
-				|| typeName.equals("byte") || typeName.equals("short")
-				|| typeName.equals("int") || typeName.equals("long")
-				|| typeName.equals("float") || typeName.equals("double"));
-	}
-
-	/**
-	 * Returns the handle of the IProject at the beginning of the given
-	 * <code>absolutePath</code>. Neither the given path nor the project need
-	 * exist in the workspace. The path must be absolute, and must consist of at
-	 * least one segment.
-	 * 
-	 * @return An IProject handle for the project at the beginning of the given
-	 *         <code>absolutePath</code>, or null if the path does not
-	 *         specify a project.
-	 */
-	public static IProject getProjectOf(IPath absolutePath) {
-		if (absolutePath.isAbsolute()) {
-			String projectName = absolutePath.segment(0);
-			if (projectName != null) {
-				return getWorkspaceRoot().getProject(projectName);
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * 
-	 * @param absolutePath
-	 * @return
-	 */
-	public static IVirtualComponent getComponentOf(IPath absolutePath){
-		if (absolutePath.isAbsolute()) {
-			String componentName = absolutePath.segment(1);
-			if (componentName != null) {
-				String projectName = absolutePath.segment(0);
-				IProject project = getWorkspaceRoot().getProject(projectName);
-				if (projectName != null) {
-					return ComponentCore.createComponent(project, componentName);
-				}
-			}
-		}
-		return null;
-	}
-	
-	
-	/**
-	 * Returns true if the given <code>project</code> is a Java Project.
-	 * 
-	 * @param project
-	 *            The project.
-	 * @return True if the project is a Java Project.
-	 */
-	public static boolean isJavaProject(IProject project) {
-		return (JavaCore.create(project) != null);
-	}
-
-	/**
-	 * Returns true if the given <code>project</code> is a Java Project.
-	 * 
-	 * @param project
-	 *            The project.
-	 * @return True if the project is a Java Project.
-	 */
-	public static boolean isTrueJavaProject(IProject project) {
-		return (!isWebProject(project) && !isAppClientProject(project) && !isEARProject(project)
-				&& !isEJBProject(project) && isJavaProject(project));
-		/*
-		 * try { String[] natures = project.getDescription().getNatureIds();
-		 * return (natures.length == 1 &&
-		 * natures[0].equals(JavaCore.NATURE_ID)); } catch (CoreException e) { }
-		 * return false;
-		 */
-	}
-
-	/**
-	 * Returns true if the given <code>project</code> is a Web Project.
-	 * Note: For components; use J2EEUtils.isWebComponent()
-	 * @param project
-	 *            The project.
-	 * @return True if the project is a Web Project.
-	 */
-	public static boolean isWebProject(IProject project) {
-		boolean isWeb = false;
-		StructureEdit mc = null;
-		try {
-		  mc = StructureEdit.getStructureEditForRead(project);
-		  WorkbenchComponent[] wbcs = mc.getWorkbenchModules();
-		  if (wbcs.length!=0) {
-			  isWeb = WebArtifactEdit.isValidWebModule(wbcs[0]);
-		  }
-		}
-		catch(Exception ex){
-			// handle exception
-		}
-		finally{
-			if (mc!=null)
-				mc.dispose();
-		}
-
-		return isWeb;
-	}
-
-	/**
-	 * Note: for components; use J2EEUtils.isEARComponent()
-	 * @param project
-	 * @return
-	 */
-	public static boolean isEARProject(IProject project){
-		boolean isEAR = false;
-		StructureEdit mc = null;
-		try {
-		  mc = StructureEdit.getStructureEditForRead(project);
-		  WorkbenchComponent[] wbcs = mc.getWorkbenchModules();
-		  if (wbcs.length!=0) {
-			EARArtifactEdit earEdit = null;
-			try {
-			  earEdit = EARArtifactEdit.getEARArtifactEditForRead(wbcs[0]);
-			  if (earEdit!=null){
-				isEAR = true;
-			  }
-			}
-			finally{
-				if (earEdit!=null)
-					earEdit.dispose();
-			}
-		  }
-		}
-		catch(Exception ex){}
-		finally{
-			if (mc!=null)
-				mc.dispose();
-		}
-		
-		return isEAR;
-	}
-	/**
-	 * Returns true if the given <code>project</code> is an EJB 1.1 or EJB 2.0
-	 * Project.
-	 * Note: for components, use J2EEUtils.isEJBComponent
-	 * @param project
-	 *            The project.
-	 * @return True if the project is an EJB 1.1 or an EJB 2.0 Project.
-	 */
-	public static boolean isEJBProject(IProject project) {
-		boolean isEJB = false;
-		StructureEdit mc = null;
-		try {
-		  mc = StructureEdit.getStructureEditForRead(project);
-		  WorkbenchComponent[] wbcs = mc.getWorkbenchModules();
-		  if (wbcs.length!=0) {
-			EJBArtifactEdit ejbEdit = null;
-			try {
-			  ejbEdit = EJBArtifactEdit.getEJBArtifactEditForRead(wbcs[0]);
-			  if (ejbEdit!=null){
-				isEJB = true;
-			  }
-			}
-			finally{
-				if (ejbEdit!=null)
-					ejbEdit.dispose();
-			}
-		  }
-		}
-		catch(Exception ex){}
-		finally{
-			if (mc!=null)
-				mc.dispose();
-		}
-		
-		return isEJB;	
-	}
-
-	/**
-	 * Returns true if the given <code>project</code> is an Application Client
-	 * Project.
-	 * Note: for components, use J2EEUtils.isAppClientComponent()
-	 * @param project
-	 *            The project.
-	 * @return True if the project is an Application Client Project
-	 */
-	public static boolean isAppClientProject(IProject project) {
-		boolean isAppClient = false;
-		StructureEdit mc = null;
-		try {
-		  mc = StructureEdit.getStructureEditForRead(project);
-		  WorkbenchComponent[] wbcs = mc.getWorkbenchModules();
-		  if (wbcs.length!=0) {
-			AppClientArtifactEdit appClientEdit = null;
-			try {
-				appClientEdit = AppClientArtifactEdit.getAppClientArtifactEditForRead(wbcs[0]);
-			  if (appClientEdit!=null){
-				  isAppClient = true;
-			  }
-			}
-			finally{
-				if (appClientEdit!=null)
-					appClientEdit.dispose();
-			}
-		  }
-		}
-		catch(Exception ex){}
-		finally{
-			if (mc!=null)
-				mc.dispose();
-		}
-		
-		return isAppClient;	
-	}
-
-	/**
-	 * Returns the type of the given <code>project</code> as a bitmask.
-	 * Relevant bitmask values are:
-	 * <ol>
-	 * <li>{@link #PROJECT_TYPE_JAVA PROJECT_TYPE_JAVA}
-	 * <li>{@link #PROJECT_TYPE_WEB PROJECT_TYPE_WEB}
-	 * <li>{@link #PROJECT_TYPE_EJB PROJECT_TYPE_EJB}
-	 * <li>{@link #PROJECT_TYPE_NONE PROJECT_TYPE_NONE}
-	 * </ol>
-	 * 
-	 * @param project
-	 *            The project.
-	 * @return The type bitmask of the project.
-	 */
-	public static byte getProjectType(IProject project) {
-		byte projectType = PROJECT_TYPE_NONE;
-		if (ResourceUtils.isJavaProject(project)) {
-			projectType |= PROJECT_TYPE_JAVA;
-		}
-		if (ResourceUtils.isWebProject(project)) {
-			projectType |= PROJECT_TYPE_WEB;
-		}
-		if (ResourceUtils.isEJBProject(project)) {
-			projectType |= PROJECT_TYPE_EJB;
-		}
-		Log log = new EclipseLog();
-		log.log(Log.INFO, 5031, ResourceUtils.class, "getProjectType",
-				"project=" + project + ",projectType=" + projectType);
-
-		return projectType;
-	}
-
-	public static byte getComponentType(IProject project, String componentName){
-		IVirtualComponent comp = ComponentCore.createComponent(project, componentName);
-		return getComponentType(comp);
-	}
-	
-	public static byte getComponentType(IVirtualComponent component){
-		
-		byte ctype = PROJECT_TYPE_NONE;
-		if (J2EEUtils.isJavaComponent(component)) {
-			ctype |= PROJECT_TYPE_JAVA;
-		}
-		if (J2EEUtils.isWebComponent(component)) {
-			ctype |= PROJECT_TYPE_WEB;
-		}
-		if (J2EEUtils.isEJBComponent(component)) {
-			ctype |= PROJECT_TYPE_EJB;
-		}
-		if (J2EEUtils.isAppClientComponent(component)){
-			ctype |= PROJECT_TYPE_APPCLIENT;
-		}
-
-		return ctype;		
-	}
-	
-	/**
-	 * 
-	 * @param project
-	 * @return
-	 * 
-	 * @deprecated not used
-	 */
-	public static String getProjectTypeAsString(IProject project) {
-		if (ResourceUtils.isEJBProject(project))
-			return WebServicePlugin.getMessage("%LABEL_EJB");
-		else if (ResourceUtils.isWebProject(project))
-			return WebServicePlugin.getMessage("%LABEL_WEB");
-		else if (ResourceUtils.isJavaProject(project))
-			return WebServicePlugin.getMessage("%LABEL_JAVA");
-		else
-			return "";
-	}
-	
-
-	/**
-	 * Returns WebModule Deployable of the <code>project</code> as an
-	 * <code>IDeployable</code>, or null if the project has no Web nature.
-	 * 
-	 * @param project
-	 *            The project.
-	 * @return WebModule Deployable of the <code>project</code> or null if the
-	 *         project has no Web nature.
-	 * @deprecated  should be using a more specific call (ServerUtils?)
-	 */
-	public static IModule getModule(IProject project) {
-		IModule[] modules = ServerUtil.getModules(project);
-		if (modules!=null && modules.length!=0) {
-			return modules[0];
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the build output location of the <code>project</code> as an
-	 * <code>IPath</code>, or null if the project has no Java nature.
-	 * 
-	 * @param project
-	 *            The project.
-	 * @return The build output location of the <code>project</code> or null
-	 *         if the project has no Java nature.
-	 */
-	public static IPath getJavaOutputLocation(IProject project) {
-		IPath outputLocation = null;
-		try {
-			IJavaProject javaProject = JavaCore.create(project);
-			if (javaProject != null) {
-				outputLocation = javaProject.getOutputLocation();
-			}
-		} catch (JavaModelException e) {
-		}
-		Log log = new EclipseLog();
-		log.log(Log.INFO, 5032, ResourceUtils.class, "getJavaOutputLocation",
-				"project=" + project + ",outputLocation=" + outputLocation);
-
-		return outputLocation;
-	}
-	
-	public static IPath getJavaOutputLocation(IVirtualComponent comp){
-		
-		return null;
-	}
-
-	/**
-	 * Returns a build source location of the <code>project</code> as an
-	 * <code>IPath</code>, or null if the project either has no Java nature
-	 * or if the project's build classpath contains no folders local to the
-	 * project. If the project has more than one of its own folders on the build
-	 * classpath, then one of them is chosen arbitrarily as the build source
-	 * location. To work with all entries on the build classpath, use
-	 * {@link #getJavaPackageFragmentRoots getJavaPackageFragmentRoots()}or
-	 * {@link #getJavaClasspath getJavaClasspath()}.
-	 * 
-	 * @param project
-	 *            The project.
-	 * @return A build source location of the <code>project</code> or null if
-	 *         the project has no Java nature or if the project's build
-	 *         classpath contains no folders local to the project.
-	 */
-	public static IPath getJavaSourceLocation(IProject project) {
-		IPath sourceLocation = null;
-		IPackageFragmentRoot[] fragmentRoots = getJavaPackageFragmentRoots(project);
-		for (int i = 0; i < fragmentRoots.length && sourceLocation == null; i++) {
-			try {
-				IResource fragmentRoot = fragmentRoots[i]
-						.getCorrespondingResource();
-				if (fragmentRoot != null
-						&& (fragmentRoot.getProject().equals(project))
-						&& (fragmentRoot.getType() != IResource.FILE)) {
-					sourceLocation = fragmentRoot.getFullPath();
-				}
-			} catch (JavaModelException e) {
-			}
-		}
-
-		Log log = new EclipseLog();
-		log.log(Log.INFO, 5030, ResourceUtils.class, "getJavaSourceLocation",
-				"project=" + project + ",sourceLocation=" + sourceLocation);
-		
-		System.out.println("Java sourceLocation = "+sourceLocation);
-		return sourceLocation;
-	}
-
-	public static IPath getJavaSourceLocation(IVirtualComponent comp){
-		
-		return null;
-	}
-	
-	public static IPath[] getAllJavaSourceLocations(IProject project) {
-		Vector pathVector = new Vector();
-		IPackageFragmentRoot[] fragmentRoots = getJavaPackageFragmentRoots(project);
-
-		for (int i = 0; i < fragmentRoots.length; i++) {
-			try {
-				IResource fragmentRoot = fragmentRoots[i]
-						.getCorrespondingResource();
-				if (fragmentRoot != null
-						&& (fragmentRoot.getProject().equals(project))
-						&& (fragmentRoot.getType() != IResource.FILE)) {
-					pathVector.add(fragmentRoot.getFullPath());
-				}
-			} catch (JavaModelException e) {
-			}
-		}
-		Log log = new EclipseLog();
-		log.log(Log.INFO, 5033, ResourceUtils.class,
-				"getAllJavaSourceLocations", "project=" + project);
-
-		return (IPath[]) pathVector.toArray(new Path[pathVector.size()]);
-	}
-
-	public static IPath[] getAllJavaSourceLocations(IVirtualComponent[] components) {
-		return null;
-	}
-	
-	/**
-	 * Returns a build source package fragment root of the <code>project</code>
-	 * as an <code>IPackageFragmentRoot</code>, or null if the project either
-	 * has no Java nature or if the project's build classpath contains no
-	 * folders local to the project. If the project has more than one of its own
-	 * folders on the build classpath, then one of them is chosen arbitrarily as
-	 * the build source location.
-	 * 
-	 * @param project
-	 *            The project.
-	 * @return A build source package fragment root of the <code>project</code>
-	 *         or null if the project has no Java nature or if the project's
-	 *         build classpath contains no folders local to the project.
-	 *         
-	 * @deprecated not used
-	 */
-	public static IPackageFragmentRoot getJavaSourcePackageFragmentRoot(
-			IProject project) {
-		IPackageFragmentRoot packageFragmentRoot = null;
-		IPath javaSourceLocation = getJavaSourceLocation(project);
-		try {
-			IJavaProject javaProject = JavaCore.create(project);
-			if (javaProject != null) {
-				packageFragmentRoot = javaProject
-						.findPackageFragmentRoot(javaSourceLocation);
-
-			}
-		} catch (JavaModelException e) {
-		}
-		Log log = new EclipseLog();
-		log.log(Log.INFO, 5034, ResourceUtils.class,
-				"getJavaSourcePackageFragmentRoot", "project=" + project
-						+ ",sourceLocation=" + javaSourceLocation
-						+ ",sourcePackageFragmentRoot=" + packageFragmentRoot);
-
-		return packageFragmentRoot;
-	}
-
-	/**
-	 * Returns the package fragment roots of the <code>project</code> as an
-	 * array of <code>IPackageFragmentRoot</code> objects. If the project has
-	 * no Java nature then the returned array will be of length zero.
-	 * 
-	 * @param project
-	 *            The project.
-	 * @return The package fragment roots of the <code>project</code>.
-	 */
-	public static IPackageFragmentRoot[] getJavaPackageFragmentRoots(
-			IProject project) {
-		try {
-			IJavaProject javaProject = JavaCore.create(project);
-			if (javaProject != null) {
-				IPackageFragmentRoot[] packageFragmentRoots = javaProject
-						.getPackageFragmentRoots();
-				return packageFragmentRoots;
-			}
-		} catch (JavaModelException e) {
-		}
-		return new IPackageFragmentRoot[0];
-	}
-
-	/**
-	 * Returns the build classpath entries of the <code>project</code> as an
-	 * array of <code>IClasspathEntry</code> objects. If the project has no
-	 * Java nature then the returned array will be of length zero.
-	 * 
-	 * @param project
-	 *            The project.
-	 * @return The classpath entries of the <code>project</code>.
-	 * 
-	 * @deprecated not used
-	 */
-	public static IClasspathEntry[] getJavaClasspath(IProject project) {
-		try {
-			IJavaProject javaProject = JavaCore.create(project);
-			if (javaProject != null) {
-				IClasspathEntry[] classpathEntries = javaProject
-						.getRawClasspath();
-				return classpathEntries;
-			}
-		} catch (JavaModelException e) {
-		}
-		return new IClasspathEntry[0];
-	}
-
-	/**
-	 * Returns the container corresponding to the web server module root of the
-	 * project (ie. the "webApplication" folder) or null if the project has no
-	 * Web nature.
-	 * 
-	 * @param project
-	 *            The project.
-	 * @return The web server module root container or null if the project has
-	 *         no Web nature.
-	 * @deprecated use getWebModuleServerRoot(project, compName)
-	 */
-	public static IContainer getWebModuleServerRoot(IProject project) {
-		IContainer webModuleServerRoot = null;
-		StructureEdit mc = null;
-		try {
-			mc = StructureEdit.getStructureEditForRead(project);
-			WorkbenchComponent[] wbcs = mc.getWorkbenchModules();
-			if (wbcs.length!=0) {
-				webModuleServerRoot = StructureEdit.getOutputContainerRoot(wbcs[0]);
-				IFolder fwebModuleServerRoot = StructureEdit.getOutputContainerRoot(wbcs[0]);
-				fwebModuleServerRoot.getFolder("WEB-INF").getFolder("classes");
-				
-				IFolder[] folder = StructureEdit.getOutputContainersForProject(project);
-				
-				if (folder.length!=0)
-				System.out.println("WebModuleServerRoot = "+folder[0]);
-				
-			}
-//			IProjectNature nature = project.getNature(IWebNatureConstants.J2EE_NATURE_ID);
-//			if (nature != null && (nature instanceof IDynamicWebNature)) {
-//			  IDynamicWebNature webNature = (IDynamicWebNature) nature;
-//				webModuleServerRoot = webNature.getRootPublishableFolder();
-//			}
-		} catch (Exception e) {
-			Log log = new EclipseLog();
-			log.log(Log.ERROR, 5035, ResourceUtils.class, "getWebModuleServerRoot",
-					"project=" + project + ",webModuleServerRoot="
-							+ webModuleServerRoot);			
-		}
-		finally{
-			if (mc!=null)
-				mc.dispose();
-		}
-
-		return webModuleServerRoot;
-	}
-
-	public static IContainer getWebModuleServerRoot(IProject project, String componentName){
-		
-		return null;
-	}
-
-	/**
-	 * Returns the URL string corresponding to the web server module root of the
-	 * project in a server instance or null if the project has no Web nature or
-	 * has no association to a server instance.
-	 * 
-	 * @param project
-	 *            The project.
-	 * @return The web server module root URL or null if the project has no Web
-	 *         nature or has no association to a server instance.
-	 * @deprecated use getWebComponentURL(..)
-	 */
-	public static String getWebProjectURL(IProject project,
-			String serverFactoryId, IServer server) {
-
-		String webProjectURL = null;
-		IModule module = getModule(project);
-		if (module != null) {
-			IServer serverInstance = ServerUtils.getServerForModule(module,
-					serverFactoryId, server, true, new NullProgressMonitor());
-			if (serverInstance != null) {
-//				URL url = ((IURLProvider) serverInstance.getDelegate()).getModuleRootURL(module);
-				URL url = ((IURLProvider)serverInstance.getAdapter(IURLProvider.class)).getModuleRootURL(module);
-				if (url != null) {
-					String s = url.toString();
-					webProjectURL = (s.endsWith("/") ? s.substring(0, s
-							.length() - 1) : s);
-				}
-			}
-		}
-		
-		Log log = new EclipseLog();
-		log.log(Log.INFO, 5036, ResourceUtils.class, "getWebProjectURL",
-				"project=" + project + ",webProjectURL=" + webProjectURL);
-
-		return webProjectURL;
-	}
-	
-	public static String getWebComponentURL(IProject project, String componentName,
-							String serverFactoryId, IServer server){
-		
-		return null;
-	}
-
-	/**
-	 * Returns the forged URL string corresponding to the web server module root
-	 * of the project in a server instance or null if the project has no Web
-	 * nature or has no association to a server instance.
-	 * 
-	 * @param project
-	 * @return The web server module root URL or null if the project has no Web
-	 *         nature or has no association to a server instance.
-	 * @deprecated 
-	 */
-	public static String getForgedWebProjectURL(IProject project, String serverFactoryId, IServer server){
-  	
-  	String webProjectURL = null;
-  	IModule module = getModule(project);
-  	if (module != null)
-  	{
-  		//IServer serverInstance = ServerUtils.getServerForModule(module,
-		  // serverFactoryId, server, true, new NullProgressMonitor());
-  		if (server != null)
-  		{
-  			String hostname = server.getHost();
-
-  			// get ServerPort
-  			int portNumber = 0;
-
-  	          ServerPort[] ports = server.getServerPorts();
-  	          ServerPort port = null;
-  	          for (int it = 0; it<ports.length; it++)
-  	          {
-  	            ServerPort p = ports[it];
-  	            String protocol = p.getProtocol();
-  	            if (protocol != null && protocol.trim().toLowerCase().equals("http"))
-  	            {
-  	              port = p;
-  	              portNumber = p.getPort();
-  	              break;
-  	            }
-  	          }
-  	          
-  	        
-  	        
-  	        URL url = null;
-  	        try {
-  	        	url = new URL("http", hostname, portNumber, "");
-  	        }
-  	        catch(Exception e){
-  	        	e.printStackTrace();
-  	        }
-
-  	        
-  			//URL url = ((IURLProvider) serverInstance.getDelegate()).getModuleRootURL(module);
-  			
-  			if (url != null)
-  			{
-  				String s = url.toString();
-  				webProjectURL = s + "/"+project.getName();
-  				//webProjectURL = (s.endsWith("/") ? s.substring(0,s.length()-1) : s);
-  			}
-  		}
-  	}
- 	Log log = new EclipseLog();
-    log.log(Log.INFO, 5036, ResourceUtils.class, "getWebProjectURL", "project="+project+",webProjectURL="+webProjectURL);
-  	return webProjectURL;  	
-  }
-	/**
-	 * Returns the URL string corresponding to the web server module root of the
-	 * project in a server instance or null if the project has no Web nature or
-	 * has no association to a server instance.
-	 * 
-	 * @param project
-	 *            The project.
-	 * @return The web server module root URL or null if the project has no Web
-	 *         nature or has no association to a server instance.
-	 *
-	 */
-	public static String getWebProjectURL(IProject project) {
-		String webProjectURL = null;
-		IModule module = getModule(project);
-		if (module != null) {
-			IServer serverInstance = ServerUtils.getServerForModule(module);
-			if (serverInstance != null) {
-				URL url = ((IURLProvider)serverInstance.getAdapter(IURLProvider.class)).getModuleRootURL(module);
-				if (url != null) {
-					String s = url.toString();
-					webProjectURL = (s.endsWith("/") ? s.substring(0, s
-							.length() - 1) : s);
-				}
-			}
-		}
-		Log log = new EclipseLog();
-		log.log(Log.INFO, 5037, ResourceUtils.class, "getWebProjectURL",
-				"project=" + project + ",webProjectURL=" + webProjectURL);
-
-		return webProjectURL;
-	}
-
-	public static String getWebComponentURL(IVirtualComponent component){
-		
-		return null;
-	}
-	
-	public static String getEncodedWebProjectURL(IProject project) {
-		String url = getWebProjectURL(project);
-		if (url != null) {
-			int index = url.lastIndexOf('/');
-			if (index != -1) {
-				StringBuffer encodedURL = new StringBuffer();
-				encodedURL.append(url.substring(0, index + 1));
-				try {
-					String ctxtRoot = URLEncoder.encode(url.substring(index + 1, url.length()), "UTF-8");
-					int plusIndex = ctxtRoot.indexOf('+');
-					while (plusIndex != -1) {
-						StringBuffer sb = new StringBuffer();
-						sb.append(ctxtRoot.substring(0, plusIndex));
-						sb.append("%20");
-						sb.append(ctxtRoot.substring(plusIndex + 1, ctxtRoot
-							.length()));
-						ctxtRoot = sb.toString();
-						plusIndex = ctxtRoot.indexOf('+');
-					}
-					encodedURL.append(ctxtRoot);
-				}catch (IOException io){
-					//handler exception
-				}				
-				url = encodedURL.toString();
-			}
-		}
-		return url;
-	}
-
-	public static String getEncodedWebComponentURL(IVirtualComponent component){
-		
-		return null;
-	}
-	
-	/**
-	 * Given the <code>absolutePath</code> of a Java resource, returns the
-	 * package name of the resource or null if the resource is not properly
-	 * located in a project or folder on the build classpath or that is the
-	 * build output path.
-	 * 
-	 * @param absolutePath
-	 *            The absolute path of the Java resource.
-	 * @return the package name of the Java resource.
-	 */
-	public static String getJavaResourcePackageName(IPath absolutePath) {
-		try {
-			IPath javaFolderPath = absolutePath.removeLastSegments(1);
-			IProject project = getProjectOf(absolutePath);
-			IJavaProject javaProject = JavaCore.create(project);
-			if (javaProject != null) {
-				IPackageFragment fragment = javaProject
-						.findPackageFragment(javaFolderPath);
-				if (fragment != null) {
-					return fragment.getElementName();
-				}
-				IPath outputPath = getJavaOutputLocation(project);
-				if (outputPath.isPrefixOf(javaFolderPath)) {
-					IPath javaPackagePath = javaFolderPath
-							.removeFirstSegments(outputPath.segmentCount());
-					return javaPackagePath.isEmpty() ? null : javaPackagePath
-							.toString().replace(IPath.SEPARATOR, '.');
-				}
-			}
-		} catch (JavaModelException e) {
-		}
-		return null;
-	}
-
-	/**
-	 * Given the <code>absolutePath</code> of a Java resource, returns the
-	 * package name of the resource as a relative pathname or null if the
-	 * resource is not properly located in a project or folder on the build
-	 * classpath.
-	 * 
-	 * @param absolutePath
-	 *            The absolute path of the Java resource.
-	 * @return the package name of the Java resource as a relative path.
-	 */
-	public static IPath getJavaResourcePackagePath(IPath absolutePath) {
-		String packageName = ResourceUtils
-				.getJavaResourcePackageName(absolutePath);
-		return (packageName == null ? null : new Path(packageName.replace('.',
-				IPath.SEPARATOR)));
-	}
-
-	/**
-	 * Given the <code>absolutePath</code> of a Java resource, returns the
-	 * absolute path of the project or folder that is on the build classpath or
-	 * is the build output path and that contains the fully qualified Java
-	 * resource, or null if no such project or folder exists.
-	 * 
-	 * @param absolutePath
-	 *            The absolute path of the Java resource.
-	 * @return The absolute path of the project or folder containing the fully
-	 *         qualified Java resource.
-	 */
-	public static IPath getJavaResourceRootPath(IPath absolutePath) {
-		try {
-			IProject project = getProjectOf(absolutePath);
-			IJavaProject javaProject = JavaCore.create(project);
-			if (javaProject != null) {
-				IPackageFragmentRoot[] pfrs = javaProject
-						.getPackageFragmentRoots();
-				for (int i = 0; i < pfrs.length; i++) {
-					IResource fragmentRoot = pfrs[i].getCorrespondingResource();
-					if (fragmentRoot != null) {
-						IPath fragmentPath = fragmentRoot.getFullPath();
-						if (fragmentPath.isPrefixOf(absolutePath)) {
-							return fragmentPath;
-						}
-					}
-				}
-				IPath outputPath = getJavaOutputLocation(project);
-				if (outputPath.isPrefixOf(absolutePath)) {
-					return outputPath;
-				}
-			}
-		} catch (JavaModelException e) {
-		}
-		return null;
-	}
-
-	/**
-	 * Determines an URL (HTTP or FILE) to an Eclipse resource, returning the
-	 * URL string if successful and false otherwise. A value of null will
-	 * definitely be returned if any of the following conditions are not met:
-	 * <ol>
-	 * <li>The absolute path begins with a Web Project.
-	 * <li>The leading portion of the absolute path matches the path of the
-	 * container returned by {#link #getWebModuleServerRoot
-	 * getWebModuleServerRoot} for the project.
-	 * <li>The path does not lead to the WEB-INF folder or any descendent
-	 * thereof.
-	 * <li>The Web Project is associated with an explicit or default server
-	 * instance.
-	 * </ol>
-	 * 
-	 * @param absolutePath
-	 *            The absolute path of the resource.
-	 * @return The URL of the file, or null if no URL can be determined.
-	 */
-	public static String getURLFromPath(IPath absolutePath,
-			String serverFactoryId, IServer server) {
-		return getURLFromPath(absolutePath, getWebProjectURL(
-				getProjectOf(absolutePath), serverFactoryId, server));
-	}
-
-	public static String getURLFromPath(IPath absolutePath, String webProjectURL) {
-		StringBuffer url = new StringBuffer();
-		IProject project = getProjectOf(absolutePath);
-		IContainer webModuleServerRoot = getWebModuleServerRoot(project);
-		if (webModuleServerRoot != null) {
-			IPath webModuleServerRootPath = webModuleServerRoot.getFullPath();
-			if (webModuleServerRootPath.isPrefixOf(absolutePath)) {
-				int numSegment = webModuleServerRootPath.segmentCount();
-				int numSegmentFromPath = absolutePath.segmentCount();
-				if (numSegmentFromPath > numSegment) {
-					String nextSegment = absolutePath.segment(numSegment);
-					// check if the segment after the WebModuleServerRoot is
-					// WEB-INF (ignoring case)
-					if (nextSegment != null	&& !nextSegment.equalsIgnoreCase("WEB-INF")) {
-						IPath relativePath = absolutePath.removeFirstSegments(numSegment);
-						if (webProjectURL != null)
-							url.append(webProjectURL).append(IPath.SEPARATOR).append(relativePath.toString());
-					}
-				} else if (numSegmentFromPath == numSegment)
-					url.append(webProjectURL);
-			}
-		}
-		if (url.length() < 1) {
-			IWorkspaceRoot workspace = ResourcesPlugin.getWorkspace().getRoot();
-			url.append(getResourceURI(workspace.getFile(absolutePath)));
-		}
-		Log log = new EclipseLog();
-		log.log(Log.INFO, 5038, ResourceUtils.class, "getURLFromPath",
-				"absolutePath=" + absolutePath + ",url=" + url);
-
-		return url.toString();
-	}
-
-	/**
-	 * 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,
-	//    StatusMonitor statusMonitor
-	//  )
-	//  throws CoreException
-	//  {
-	//    if (!absolutePath.isAbsolute())
-	//    {
-	//      throw new CoreException(new
-	// Status(IStatus.ERROR,WebServicePlugin.ID,0,WebServicePlugin.getMessage("%MSG_ERROR_PATH_NOT_ABSOLUTE",new
-	// Object[] {absolutePath.toString()}),null));
-	//    }
-	//    if (absolutePath.segmentCount() < 1)
-	//    {
-	//      throw new CoreException(new
-	// Status(IStatus.ERROR,WebServicePlugin.ID,0,WebServicePlugin.getMessage("%MSG_ERROR_PATH_EMPTY",new
-	// Object[] {absolutePath.toString()}),null));
-	//    }
-	//    if (absolutePath.segmentCount() < 2)
-	//    {
-	//      throw new CoreException(new
-	// Status(IStatus.ERROR,WebServicePlugin.ID,0,WebServicePlugin.getMessage("%MSG_ERROR_PATH_NOT_FOLDER",new
-	// Object[] {absolutePath.toString()}),null));
-	//    }
-	//    IContainer parent = makeFolderPath(resourceContext,
-	// absolutePath.removeLastSegments(1), progressMonitor, statusMonitor);
-	//    String fileName = absolutePath.lastSegment();
-	//    return makeFile(resourceContext, parent, fileName, inputStream,
-	// progressMonitor, statusMonitor);
-	//  }
-	/**
-	 * 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,
-	//    StatusMonitor 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,
-	//    IFile file,
-	//    IProgressMonitor progressMonitor,
-	//    StatusMonitor statusMonitor
-	//  )
-	//  throws CoreException
-	//  {
-	//    return new FileResourceOutputStream(context, file, progressMonitor,
-	// statusMonitor);
-	//  }
-	/**
-	 * Copies a set of files from a plugin's installation location to an Eclipse
-	 * folder. The files are named in an index file located relative to the
-	 * plugin's installation location.
-	 * 
-	 * @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 indexPathname
-	 *            A file containing a whitespace-delimitted list of pathnames of
-	 *            the files to copy. The pathnames are relative to the
-	 *            <code>plugin sourcePath</code>. Must not be null.
-	 * @param targetPath
-	 *            The absolute Eclipse path of the folder to which the files
-	 *            will be copied. The relative pathnames of the files named in
-	 *            the <code>indexPathname</code> file are 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 overwriteFiles
-	 *            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 copyIndexedFiles (
-	//        ResourceContext resourceContext,
-	//    Plugin plugin,
-	//    IPath sourcePath,
-	//    IPath indexPathname,
-	//    IPath targetPath,
-	//    IProgressMonitor progressMonitor,
-	//    StatusMonitor statusMonitor
-	//  )
-	//  throws CoreException
-	//  {
-	//    try
-	//    {
-	//      InputStream input = plugin.openStream(indexPathname);
-	//      Enumeration filenames = StringUtils.parseFilenamesFromStream(input);
-	//      copyEnumeratedFiles(resourceContext, plugin, sourcePath, filenames,
-	// targetPath, progressMonitor, statusMonitor);
-	//    }
-	//    catch (IOException e)
-	//    {
-	//      throw new CoreException(new
-	// Status(IStatus.ERROR,plugin.getDescriptor().getUniqueIdentifier(),0,WebServicePlugin.getMessage("%MSG_ERROR_IO"),e));
-	//    }
-	//  }
-	/**
-	 * Copies a set of files from a plugin's installation location to an Eclipse
-	 * folder. The files are named in an enumeration.
-	 * 
-	 * @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 pathnames
-	 *            An enumeration of pathnames of the files to copy. The
-	 *            pathnames are relative to the <code>plugin sourcePath</code>.
-	 *            Must not be null.
-	 * @param targetPath
-	 *            The absolute Eclipse path of the folder to which the files
-	 *            will be copied. The relative pathnames of the files named in
-	 *            the <code>pathnames</code> enumeration are 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 overwriteFiles
-	 *            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 copyEnumeratedFiles (
-	//        ResourceContext resourceContext,
-	//    Plugin plugin,
-	//    IPath sourcePath,
-	//    Enumeration pathnames,
-	//    IPath targetPath,
-	//    IProgressMonitor progressMonitor,
-	//    StatusMonitor statusMonitor
-	//  )
-	//  throws CoreException
-	//  {
-	//    while (pathnames.hasMoreElements())
-	//    {
-	//      String filename = (String)pathnames.nextElement();
-	//      copyFile(resourceContext, plugin, sourcePath, new Path(filename),
-	// targetPath, progressMonitor, statusMonitor);
-	//    }
-	//  }
-	/**
-	 * 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,
-	//    StatusMonitor 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.getDescriptor().getUniqueIdentifier(),0,WebServicePlugin.getMessage("%MSG_ERROR_IO"),e));
-	//    }
-	//  }
-	/**
-	 * Copies a set of files from a plugin's installation location to a native
-	 * directory. The files are named in an index file located relative to the
-	 * plugin's installation location.
-	 * 
-	 * @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 indexPathname
-	 *            A file containing a whitespace-delimitted list of pathnames of
-	 *            the files to copy. The pathnames are relative to the
-	 *            <code>plugin sourcePath</code>. Must not be null.
-	 * @param targetPath
-	 *            The absolute path of the native directory to which the files
-	 *            will be copied. The relative pathnames of the files named in
-	 *            the <code>indexPathname</code> file are preserved. Must not
-	 *            be null.
-	 * @param progressMonitor
-	 *            The progress monitor for the operation, or null.
-	 * @throws IOException
-	 *             An exception indicating an IO error has occured.
-	 */
-	static public void copyIndexedFilesToOS(Plugin plugin, IPath sourcePath,
-			IPath indexPathname, IPath targetPath,
-			IProgressMonitor progressMonitor) throws IOException {
-		InputStream input = plugin.openStream(indexPathname);
-		Enumeration filenames = StringUtils.parseFilenamesFromStream(input);
-		copyEnumeratedFilesToOS(plugin, sourcePath, filenames, targetPath,
-				progressMonitor);
-	}
-
-	/**
-	 * Copies a set of files from a plugin's installation location to a native
-	 * directory. The files are named in an enumeration.
-	 * 
-	 * @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 pathnames
-	 *            An enumeration of pathnames of the files to copy. The
-	 *            pathnames are relative to the <code>plugin sourcePath</code>.
-	 *            Must not be null.
-	 * @param targetPath
-	 *            The absolute path of the native directory to which the files
-	 *            will be copied. The relative pathnames of the files named in
-	 *            the <code>pathnames</code> enumeration are preserved. Must
-	 *            not be null.
-	 * @param progressMonitor
-	 *            The progress monitor for the operation, or null.
-	 * @throws IOException
-	 *             An exception indicating an IO error has occured.
-	 */
-	static public void copyEnumeratedFilesToOS(Plugin plugin, IPath sourcePath,
-			Enumeration pathnames, IPath targetPath,
-			IProgressMonitor progressMonitor) throws IOException {
-		while (pathnames.hasMoreElements()) {
-			String filename = (String) pathnames.nextElement();
-			copyFileToOS(plugin, sourcePath, new Path(filename), targetPath,
-					progressMonitor);
-		}
-	}
-
-	/**
-	 * Copies a file from a plugin's installation location to a native
-	 * directory.
-	 * 
-	 * @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 path of the native directory to which the file
-	 *            will be copied. The relative pathname of the file is
-	 *            preserved. Must not be null.
-	 * @param progressMonitor
-	 *            The progress monitor for the operation, or null.
-	 * @throws IOException
-	 *             An exception indicating an IO error has occured.
-	 */
-	static public void copyFileToOS(Plugin plugin, IPath sourcePath,
-			IPath pathname, IPath targetPath, IProgressMonitor progressMonitor)
-			throws IOException {
-		IPath target = targetPath.append(pathname);
-		IPath source = sourcePath == null ? pathname : sourcePath
-				.append(pathname);
-		InputStream input = plugin.openStream(source);
-		OutputStream output = new FileOutputStream(target.toOSString());
-		copyStream(input, output);
-		input.close();
-		output.close();
-	}
-
-	/**
-	 * Copies data from one stream to another.
-	 * 
-	 * @param input
-	 *            The input stream.
-	 * @param output
-	 *            The output stream.
-	 * @return The number of bytes copied.
-	 * @throws IOException
-	 *             An exception if an error occurs while processing either of
-	 *             the streams.
-	 */
-	static public int copyStream(InputStream input, OutputStream output)
-			throws IOException {
-		int t = 0;
-		byte[] buffer = new byte[1024];
-		int n = input.read(buffer);
-		while (n >= 0) {
-			output.write(buffer, 0, n);
-			t += n;
-			n = input.read(buffer);
-		}
-		return t;
-	}
-
-	/**
-	 * Creates a native directory path equal to the parent portion of the given
-	 * <code>pathname</code>. If the directory already exists, then no action
-	 * is taken.
-	 * 
-	 * @param pathname
-	 *            The pathname to the file whose parent directory should be
-	 *            created.
-	 * @throws IOException
-	 *             An exception if an IO error occurs.
-	 */
-	static public void createParentDirectoryFor(String pathname)
-			throws IOException {
-		File file = new File(pathname);
-		File parent = file.getParentFile();
-		if (parent != null) {
-			parent.mkdirs();
-		}
-	}
-
-	/**
-	 * Returns the IResource represented by the given selection.
-	 * 
-	 * @param object
-	 *            The selection
-	 * @return IResource if the selection represents an IResource. Returns null
-	 *         otherwise.
-	 * @throws CoreException
-	 */
-	static public IResource getResourceFromSelection(Object obj)
-			throws CoreException {
-		IResource res = null;
-		if (obj != null) {
-			System.out.println("Object = "+ obj.getClass().getName());
-			if (obj instanceof IResource) {
-				res = (IResource) obj;
-			} else if (obj instanceof ICompilationUnit) {
-				ICompilationUnit compUnit = (ICompilationUnit) obj;
-				res = compUnit.getCorrespondingResource();
-			} else if (obj instanceof EnterpriseBean) {
-				EnterpriseBean ejbBean = (EnterpriseBean) obj;
-				IProject ejbProject = ProjectUtilities.getProject(ejbBean);
-				if (ejbProject != null)
-					res = ejbProject;
-			}
-
-		}
-
-		return res;
-	}
-
-	//----------------------------------------------------------------------
-	// Naughty bits...
-	//----------------------------------------------------------------------
-
-	//
-	// Creates a path of folders.
-	// Do not call with an absolutePath of less than one segment.
-	//
-	//  private static IContainer makeFolderPath (
-	//        ResourceContext resourceContext,
-	//    IPath absolutePath,
-	//    IProgressMonitor progressMonitor,
-	//    StatusMonitor statusMonitor
-	//  )
-	//  throws CoreException
-	//  {
-	//    if (absolutePath.segmentCount() <= 1)
-	//    {
-	//      return getWorkspaceRoot().getProject(absolutePath.segment(0));
-	//    }
-	//    else
-	//    {
-	//      IContainer parent = makeFolderPath(resourceContext,
-	// absolutePath.removeLastSegments(1), progressMonitor, statusMonitor);
-	//      String folderName = absolutePath.lastSegment();
-	//      return makeFolder(resourceContext, parent,folderName, progressMonitor ,
-	// statusMonitor);
-	//    }
-	//  }
-	//
-	// Creates a folder under a container.
-	// The container must already exist.
-	//
-	// private static IFolder makeFolder (
-	//        ResourceContext resourceContext,
-	//    IContainer parent,
-	//    String folderName,
-	//    IProgressMonitor progressMonitor,
-	//    StatusMonitor statusMonitor
-	//  )
-	//  throws CoreException
-	//  {
-	//    IResource child = parent.findMember(folderName);
-	//    if (child == null)
-	//    {
-	//      if (!resourceContext.isCreateFoldersEnabled()) {
-	//        int result = statusMonitor.reportStatus(new
-	// Status(IStatus.WARNING,WebServicePlugin.ID,0,
-	//                                                         WebServicePlugin.getMessage("%MSG_ERROR_FOLDER_CREATION_DISABLED",
-	//                                                         new Object[] {parent.getFullPath().toString(),folderName}),null),
-	// getThreeStateFileOptions());
-	//        if (result == IStatusDialogConstants.CANCEL_ID)
-	//                        return null;
-	//
-	//          if ( result == IStatusDialogConstants.YES_TO_ALL_ID)
-	//                        resourceContext.setCreateFoldersEnabled(true);
-	//
-	//      }
-	//      IFolder folder = parent.getFolder(new Path(folderName));
-	//      folder.create(true,true,progressMonitor);
-	//      return folder;
-	//    }
-	//    else if (child.getType() == IResource.FOLDER)
-	//    {
-	//      return (IFolder)child;
-	//    }
-	//    else
-	//    {
-	//      throw new CoreException(new
-	// Status(IStatus.ERROR,WebServicePlugin.ID,0,WebServicePlugin.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,
-	//    StatusMonitor statusMonitor
-	//  )
-	//  throws CoreException
-	//  {
-	//    IResource child = parent.findMember(fileName);
-	//    if (child != null)
-	//    {
-	//      if (child.getType() == IResource.FILE)
-	//      {
-	//        if (!resourceContext.isOverwriteFilesEnabled()) {
-	//          int result = statusMonitor.reportStatus( new
-	// Status(IStatus.WARNING,WebServicePlugin.ID,0,
-	//                                                         WebServicePlugin.getMessage("%MSG_ERROR_FILE_OVERWRITE_DISABLED",
-	//                                                         new Object[] {parent.getFullPath().toString(),fileName}),null),
-	// getThreeStateFileOptions());
-	//
-	//          if (result == IStatusDialogConstants.CANCEL_ID)
-	//                        return null;
-	//
-	//          if ( result == IStatusDialogConstants.YES_TO_ALL_ID)
-	//                        resourceContext.setOverwriteFilesEnabled(true);
-	//        }
-	//        //We have permission to overwrite so check if file is read-only
-	//        if (child.isReadOnly())
-	//        {
-	//          if (!resourceContext.isCheckoutFilesEnabled()) {
-	//
-	//            int result = statusMonitor.reportStatus( new
-	// Status(IStatus.WARNING,WebServicePlugin.ID,0,
-	//                                                         WebServicePlugin.getMessage("%MSG_ERROR_FILE_CHECKOUT_DISABLED",
-	//                                                         new Object[] {parent.getFullPath().toString(),fileName}),null),
-	// getThreeStateFileOptions());
-	//
-	//            if (result == IStatusDialogConstants.CANCEL_ID)
-	//                        return null;
-	//
-	//            if ( result == IStatusDialogConstants.YES_TO_ALL_ID)
-	//                        resourceContext.setCheckoutFilesEnabled(true);
-	//          }
-	//
-	//          IFile[] files = new IFile[1];
-	//          files[0] = (IFile)child;
-	//
-	//          if (
-	// !statusMonitor.reportStatus(getWorkspace().validateEdit(files,null)))
-	//                                return null;
-	//        }
-	//
-	//        //Change the contents of the existing file.
-	//            IFile file = parent.getFile(new Path(fileName));
-	//        file.setContents(inputStream,true,true,progressMonitor);
-	//        return file;
-	//
-	//      }
-	//      else
-	//      {
-	//        throw new CoreException(new
-	// Status(IStatus.ERROR,WebServicePlugin.ID,0,WebServicePlugin.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,progressMonitor);
-	//        return file;
-	//    }
-	//  }
-
-	/**
-	 * 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,
-	//    StatusMonitor statusMonitor )
-	//    throws CoreException
-	//    {
-	//        if (file.exists())
-	//        {
-	//                if (!resourceContext.isOverwriteFilesEnabled()) {
-	//                        int result = statusMonitor.reportStatus( new
-	// Status(IStatus.WARNING,WebServicePlugin.ID,0,
-	//                                                                 WebServicePlugin.getMessage("%MSG_ERROR_FILE_OVERWRITE_DISABLED",
-	//                                                                 new Object[]
-	// {file.getParent().getFullPath().toString(),file.getName()}),null),
-	// getThreeStateFileOptions());
-	//
-	//                            if (result == IStatusDialogConstants.CANCEL_ID)
-	//                        return false;
-	//
-	//                if ( result == IStatusDialogConstants.YES_TO_ALL_ID)
-	//                                resourceContext.setOverwriteFilesEnabled(true);
-	//                        }
-	//                //We have permission to overwrite so check if file is read-only
-	//                if (file.isReadOnly())
-	//                {
-	//                        if (!resourceContext.isCheckoutFilesEnabled()) {
-	//                                        int result = statusMonitor.reportStatus( new
-	// Status(IStatus.WARNING,WebServicePlugin.ID,0,
-	//                                                                 WebServicePlugin.getMessage("%MSG_ERROR_FILE_CHECKOUT_DISABLED",
-	//                                                                 new Object[]
-	// {file.getParent().getFullPath().toString(),file.getName()}),null),
-	// getThreeStateFileOptions());
-	//                        if (result == IStatusDialogConstants.CANCEL_ID)
-	//                        return false;
-	//
-	//                        if ( result == IStatusDialogConstants.YES_TO_ALL_ID)
-	//                                resourceContext.setCheckoutFilesEnabled(true);
-	//
-	//                                }
-	//                        IFile[] files = new IFile[1];
-	//                        files[0] = file;
-	//
-	//                        if (
-	// !statusMonitor.reportStatus(getWorkspace().validateEdit(files,null)))
-	//                                            return false;
-	//                }
-	//                file.delete(true,progressMonitor);
-	//                }
-	//        //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,
-	//    StatusMonitor 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, progressMonitor);
-	//      return true;
-	//    }
-	//    else
-	//      return false;
-	//
-	//  }
-	/**
-	 * Deletes a set of files that are named in an index file located relative
-	 * to the plugin's installation location.
-	 * 
-	 * @param plugin
-	 *            The plugin containing the indexed file Must not be null.
-	 * @param sourcePath -
-	 *            relative path of the indexed file passing a null in has the
-	 *            same effect as passing a "." in
-	 * @param indexFilePath -
-	 *            the indexed filename Must not be null
-	 * @param targetPath -
-	 *            path containing the files named in the indexed file Must not
-	 *            be null, this path must end with a trailing separator
-	 * @param progressMonitor
-	 */
-	//  public static void deleteIndexFilesFromOS (
-	//    Plugin plugin,
-	//    IPath indexFilePath,
-	//    IPath targetPath
-	//  )
-	//  throws IOException {
-	//    InputStream input = plugin.openStream(indexFilePath);
-	//    Enumeration filenames = StringUtils.parseFilenamesFromStream(input);
-	//    while (filenames.hasMoreElements()) {
-	//      File targetFile =
-	// targetPath.append((String)filenames.nextElement()).toFile();
-	//      if (targetFile.exists())
-	//        targetFile.delete();
-	//    }
-	//  }
-	/**
-	 * Returns a URI reference to the given Eclipse resource, or null if no such
-	 * reference can be determined (for example, if the resource does not exist
-	 * in the underlying filesystem).
-	 * 
-	 * @param resource
-	 *            The resource.
-	 * @return The URI as a string, or null if there is no URI to the resource.
-	 */
-	public static String getResourceURI(IResource resource) {
-		String uri = null;
-		IPath location = resource.getLocation();
-		if (location != null) {
-			uri = "file:" + location.toString();
-		}
-		return uri;
-	}
-
-	/**
-	 * Returns a URI reference to the given Eclipse resource using the
-	 * "platform:" protocol, or null if no such reference can be determined (for
-	 * example, if the resource does not exist in the underlying filesystem).
-	 * 
-	 * @param resource
-	 *            The resource.
-	 * @return The URI as a string, or null if there is no URI to the resource.
-	 */
-	public static String getPlatformResourceURI(IResource resource) {
-		String uri = null;
-		IPath location = resource.getFullPath();
-		if (location != null) {
-			uri = "platform:/resource" + location.toString();
-		}
-		return uri;
-	}
-
-	/**
-	 * Returns the default binding namespace string given a Java bean name
-	 * (using the convention used by CTC in GM). e.g. Java bean MyClass result
-	 * in binding namespace of
-	 * "http://www.myclass.com/definitions/MyClassRemoteInterface"
-	 * 
-	 * @param beanName
-	 *            The java bean.
-	 * @return The binding namespace as a string.
-	 */
-	public static String getBindingNamespace(String beanName) {
-		return "http://www." + beanName.toLowerCase() + ".com/definitions/"
-				+ beanName + "RemoteInterface";
-	}
-
-	/**
-	 * Returns the default schema namespace string given a Java bean name (using
-	 * the convention used by CTC in GM). e.g. Java bean MyClass result in
-	 * schema namespace of
-	 * "http://www.myclass.com/schemas/MyClassRemoteInterface"
-	 * 
-	 * @param beanName
-	 *            The java bean.
-	 * @return The schemas namespace as a string.
-	 */
-	public static String getSchemaNamespace(String beanName) {
-		return "http://www." + beanName.toLowerCase() + ".com/schemas/"
-				+ beanName + "RemoteInterface";
-	}
-
-	//  public static Vector getThreeStateFileOptions() {
-	//        Vector options = new Vector();
-	//    options.add(new
-	// StatusOption(IStatusDialogConstants.YES_ID,IStatusDialogConstants.YES_LABEL,"",""));
-	//    options.add(new
-	// StatusOption(IStatusDialogConstants.YES_TO_ALL_ID,IStatusDialogConstants.YES_TO_ALL_LABEL,"",""));
-	//    options.add(new
-	// StatusOption(IStatusDialogConstants.CANCEL_ID,IStatusDialogConstants.CANCEL_LABEL,"",""));
-	//    return options;
-	//  }
-
-	//----------------------------------------------------------------------
-
-	/**
-	 * Gets the SOAP rpcrouter servlet URL for the service project
-	 * 
-	 * @param project
-	 *            The project.
-	 * @param serverFactoryId
-	 *            The server factory id
-	 * @param server
-	 *            The server
-	 * @return The URL, possibly null.
-	 */
-
-	public static String getServletURL(IProject project,
-			String serverFactoryId, IServer server) {
-		return getServletURL(getWebProjectURL(project, serverFactoryId, server));
-	}
-
-	public static String getServletURL(String webProjectURL) {
-		if (webProjectURL == null)
-			return null;
-		else
-			return webProjectURL + SERVLET_EXT;
-	}
-
-	/**
-	 * Gets the client Web project name
-	 * 
-	 * @param projectName
-	 *            The project name to base on.
-	 * @param typeId the webservice type id.
-	 * @return The client Web project name.
-	 */
-	public static String getClientWebProjectName(String projectName, String typeId) 
-	{
-		String   baseClientWebProjectName = projectName + DEFAULT_CLIENT_WEB_PROJECT_EXT;
-		IPath    projectPath;
-		IProject project;
-		boolean  foundWebProject     = false;
-		int      i                   = 1;
-		
-		if( isSkeletonEJBType( typeId ) )
-		{
-		  // For the skeleton EJB scenario we need to create a slightly different
-		  // base name.  When the EJB project is created another project
-		  // is created with "Client" tacked onto the end.  We will
-		  // add "WS" to our client so we don't collide with the other
-		  // client project.
-		  baseClientWebProjectName = projectName + "WS" + DEFAULT_CLIENT_WEB_PROJECT_EXT;    
-		}
-		
-		String  clientWebProjectName = baseClientWebProjectName;
-		
-		while (!foundWebProject) 
-		{
-		  projectPath = new Path(clientWebProjectName).makeAbsolute();
-		  project = ResourceUtils.getProjectOf(projectPath);
-		  
-		  if (project.exists() && !ResourceUtils.isWebProject(project)) 
-		  {
-			clientWebProjectName = baseClientWebProjectName + i;
-			i++;
-		  }
-		  else 
-		  {
-			foundWebProject = true;
-		  }
-		}
-		
-		return clientWebProjectName;
-	}
-
-	public static boolean isSkeletonEJBType( String typeID )
-	{
-	  return typeID.equals( "org.eclipse.jst.ws.type.wsdl.ejb" );    
-	}
-	
-	public static String getDefaultEJBProjectName() {
-		return DEFAULT_EJB_PROJECT_NAME;
-	}
-
-	public static String getDefaultWebProjectName() {
-		return DEFAULT_WEB_PROJECT_NAME;
-	}
-
-	/**
-	 * 
-	 * @param projectName
-	 * @return
-	 * 
-	 */
-	public static String getRouterProjectName(String projectName) {
-		return projectName + DEFAULT_ROUTER_PROJECT_EXT;
-	}
-
-	public static String getDefaultServiceEARProjectName() {
-		return DEFAULT_SERVICE_EAR_PROJECT_NAME;
-	}
-
-	public static String getDefaultClientEARProjectName() {
-		return DEFAULT_CLIENT_EAR_PROJECT_NAME;
-	}
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/SelectionToResource.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/SelectionToResource.java
deleted file mode 100644
index fde9f33..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/SelectionToResource.java
+++ /dev/null
@@ -1,70 +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.common;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.wst.command.env.core.data.Transformer;
-
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-
-public class SelectionToResource implements Transformer
-{
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.core.data.Transformer#transform(java.lang.Object)
-   */
-  public Object transform(Object value)
-  {
-    IStructuredSelection selection = (IStructuredSelection)value;
-    IResource            resource  = null;
-    
-    if( selection != null )
-    {
-      Object object = selection.getFirstElement();
-      
-      if( object != null )
-      {
-        if( object instanceof IResource)
-        {
-          resource = (IResource)object;
-        }
-        else if( object instanceof ICompilationUnit )
-        {
-          ICompilationUnit compUnit = (ICompilationUnit)object;
-          
-          try
-          {
-            resource = compUnit.getCorrespondingResource();
-          }
-          catch( JavaModelException exc)
-          {
-          }
-        }
-        else if( object instanceof EnterpriseBean ) 
-        {
-          EnterpriseBean ejbBean    = (EnterpriseBean)object;
-          IProject       ejbProject = ProjectUtilities.getProject( ejbBean );
-          
-          if( ejbProject != null )
-          {
-            resource = ejbProject;
-          }
-        }
-      }
-    }
-
-    return resource;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/ServerUtils.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/ServerUtils.java
deleted file mode 100644
index 2b3c1ac..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/ServerUtils.java
+++ /dev/null
@@ -1,495 +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.common;
-
-import java.util.Arrays;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.servertarget.IServerTargetConstants;
-import org.eclipse.jst.j2ee.internal.servertarget.ServerTargetHelper;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.IProjectProperties;
-import org.eclipse.wst.server.core.IRuntime;
-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.server.core.model.IRunningActionServer;
-
-/**
- * This class contains useful methods for working with Server plugin functions
- */
-public final class ServerUtils {
-
-  private MessageUtils msgUtils_;		
-  private Hashtable serverIdToLabel_;
-  private Hashtable serverLabelToId_;
-  private static ServerUtils instance_;
-
-  public static ServerUtils getInstance() {
-    if (instance_ == null) {
-      instance_ = new ServerUtils();
-    }
-    return instance_;
-
-  }
-
-  public ServerUtils(){
-    String pluginId = "org.eclipse.jst.ws";
-    msgUtils_ = new MessageUtils(pluginId + ".plugin", this);  	
-  }  
-  
-  // Gets the Server labels given the server factory id
-  public void getServerLabelsAndIds() {
-    serverIdToLabel_ = new Hashtable();
-    serverLabelToId_ = new Hashtable();
-    IServerType[] serverTypes = ServerCore.getServerTypes();
-    for (int idx = 0; idx < serverTypes.length; idx++) {
-
-      IServerType serverType = (IServerType) serverTypes[idx];
-
-      String id = serverType.getId();
-      String serverLabel = serverType.getName();
-      if (!(id == null) && !(serverLabel == null)) {
-        serverIdToLabel_.put(id, serverLabel);
-        serverLabelToId_.put(serverLabel, id);
-      }
-    }
-  }
-
-  public String getServerLabelForId(String factoryId) {
-    if (serverIdToLabel_ == null)
-      this.getServerLabelsAndIds();
-    return (String) serverIdToLabel_.get(factoryId);
-  }
-
-  public String getServerIdForLabel(String factoryLabel) {
-    if (serverLabelToId_ == null)
-      this.getServerLabelsAndIds();
-    return (String) serverLabelToId_.get(factoryLabel);
-  }
-  
-  public Status modifyModules(Environment env, IServer server, IModule module, boolean add, IProgressMonitor monitor) {
-
-  	IServerWorkingCopy wc = null;
-  	Status status = new SimpleStatus("");
-    try {
-
-      if (module==null || !module.getProject().exists()) {
-    	return status;
-      }
-
-
-      // check if module is a true Java project
-  	  if (module instanceof IModule){
-  	  	IModule pm = (IModule)module;
-  	  	if (pm!=null){
-  	  		IProject project = pm.getProject();
-  	  		if (project==null || ResourceUtils.isTrueJavaProject(project)) {
-  				return status;
-  	  		}
-  	  	}
-  	  }
-       
-      wc = server.createWorkingCopy();     
-      if (wc!=null){
-      	Object x = server.getAdapter(IRunningActionServer.class);
-        if (x!=null && x instanceof IRunningActionServer) {
-         int state = server.getServerState();
-         if (state == IServer.STATE_STOPPED || state == IServer.STATE_UNKNOWN) {
-           String mode = ILaunchManager.RUN_MODE;
-           server.synchronousStart(mode, monitor);
-         }
-        }
-     
-      List list = Arrays.asList(server.getModules());
-      if (add) {
-        if (!list.contains(module)) {
-          ServerUtil.modifyModules(wc, new IModule[] { module}, new IModule[0], monitor);
-        }
-      }
-      else { // removes module
-        if (list.contains(module)) {
-          ServerUtil.modifyModules(wc, new IModule[0], new IModule[] { module}, monitor);
-        }
-      }
-      }
-      else {
-      	// handle case of Null WC; non-issue for now
-      }
-    }
-    catch (CoreException ce) {
-        status = new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_SERVER"), Status.ERROR, ce);
-        env.getStatusHandler().reportError(status);
-        return status;
-    }
-    finally {
-        if (wc != null) {
-          // Always saveAll and release the serverWorkingCopy
-          try {
-          	wc.saveAll(true, monitor);
-          }
-          catch(CoreException cex){
-            status = new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_SERVER"), Status.ERROR, cex);
-            env.getStatusHandler().reportError(status);
-            return status;
-          }
-        }
-      }
-    return status;
-  }  
-
-  public static IServer getServerForModule(IModule module, String serverTypeId, IServer server, boolean create, IProgressMonitor monitor) {
-    if (server != null)
-      return server;
-    else
-      return getServerForModule(module, serverTypeId, create, monitor);
-  }
-
-  public static IServer getServerForModule(IModule module, String serverTypeId, boolean create, IProgressMonitor monitor) {
-    try {
-
-      IServer[] servers = ServerUtil.getServersByModule(module, monitor);
-
-      if (servers != null && servers.length > 0) {
-        if (serverTypeId == null || serverTypeId.length() == 0)
-          return servers[0]; // WSAD v4 behavior
-
-        for (int i = 0; i < servers.length; i++) {
-          if (servers[i].getServerType().getId().equalsIgnoreCase(serverTypeId))
-            return servers[i];
-        }
-      }
-
-      return createServer(module, serverTypeId, monitor);
-
-    }
-    catch (Exception e) {
-      return null;
-    }
-  }
-
-  public static IServer getServerForModule(IModule module) {
-    try {
-      IServer[] servers = ServerUtil.getServersByModule(module, null);
-      return ((servers != null && servers.length > 0) ? servers[0] : null);
-    }
-    catch (Exception e) {
-      return null;
-    }
-  }
-
-  public IServer createServer(Environment env, IModule module, String serverTypeId, IProgressMonitor monitor){
-  	IServerWorkingCopy serverWC = null;
-  	IServer server = null;
-  	try {
-      IServerType serverType = ServerCore.findServerType(serverTypeId);
-      serverWC = serverType.createServer(serverTypeId, null, monitor);
-      try{
-        if (serverWC!=null){
-          server = serverWC.saveAll(true, monitor);
-        }
-      }
-      catch(CoreException ce){
-            Status status = new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_SERVER"), Status.ERROR, ce);
-            env.getStatusHandler().reportError(status);       
-        return null;
-      }
-
-      if (server != null) {
-        
-      	Object x = server.getAdapter(IRunningActionServer.class);
-        if (x!=null && x instanceof IRunningActionServer) {
-         int state = server.getServerState();
-         if (state == IServer.STATE_STOPPED || state == IServer.STATE_UNKNOWN) {
-           String mode = ILaunchManager.RUN_MODE;
-           server.synchronousStart(mode, monitor);
-         }
-        }  
-      
-        if (module != null && module.getProject().exists()) {
-          IModule[] parentModules = server.getRootModules(module, monitor);
-          if (parentModules!=null && parentModules.length!=0) {
-          	module = (IModule)parentModules[0];
-          }
-          serverWC.modifyModules(new IModule[] { module}, new IModule[0], monitor);
-        }
-        
-      }
-
-      return server;
-    }
-    catch (Exception e) {
-        Status status = new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_SERVER"), Status.ERROR, e);
-        env.getStatusHandler().reportError(status);
-    	return null;
-    }
-    finally{
-    	try{
-    		if (serverWC!=null){
-    			serverWC.saveAll(true, monitor);
-    		}
-    	}
-    	catch(CoreException ce){
-            Status status = new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_SERVER"), Status.ERROR, ce);
-            env.getStatusHandler().reportError(status);    		
-    		return null;
-    	}
-    }
-  }  
-  
-  /*
-   * createServer This creates a server but does not report errors. 
-   * @param module 
-   * @param serverTypeId
-   * @param monitor progress monitor
-   * @return IServer returns null if unsuccessful
-   * 
-   */
-  public static IServer createServer(IModule module, String serverTypeId, IProgressMonitor monitor) {
-  	IServerWorkingCopy serverWC = null;
-  	IServer server= null;
-  	try {
-      IServerType serverType = ServerCore.findServerType(serverTypeId);
-      serverWC = serverType.createServer(serverTypeId, null, monitor);
-      
-      try{
-        if (serverWC!=null){
-          server = serverWC.saveAll(true, monitor);
-        }
-      }
-      catch(CoreException ce){
-        return null;
-      }
-      
-      if (server != null) {
-        
-      	Object x = server.getAdapter(IRunningActionServer.class);
-        if (x!=null && x instanceof IRunningActionServer) {
-         int state = server.getServerState();
-         if (state == IServer.STATE_STOPPED || state == IServer.STATE_UNKNOWN) {
-           String mode = ILaunchManager.RUN_MODE;
-           server.synchronousStart(mode, monitor);
-         }
-        }  
-        if (module != null) {
-          IModule[] parentModules = server.getRootModules(module, monitor);
-          if (parentModules!=null && parentModules.length!=0) {
-          	module = (IModule)parentModules[0];
-          }
-          serverWC.modifyModules(new IModule[] { module}, new IModule[0], monitor);
-        }
-        
-      }
-
-      return server;
-    }
-    catch (Exception e) {
-      return null;
-    }
-    finally{
-    	try{
-    		if (serverWC!=null){
-    			serverWC.saveAll(true, monitor);
-    		}
-    	}
-    	catch(CoreException ce){
-    		return null;
-    		//handler core exception
-    	}
-    }
-  }
-
-  public static String[] getServerTypeIdsByModule( IVirtualComponent component )
-  {
-	return null;  
-  }
-  
-  public static String[] getServerTypeIdsByModule(IProject project) {
-    Vector serverIds = new Vector();
-    if (project != null) {
-      IServer[] servers = ServerUtil.getServersByModule(ResourceUtils.getModule(project), null);
-      if (servers != null && servers.length > 0) {
-        for (int i = 0; i < servers.length; i++) {
-          serverIds.add(servers[i].getId());
-        }
-      }
-    }
-    return (String[]) serverIds.toArray(new String[serverIds.size()]);
-  }
-  
-  public static IServer getDefaultExistingServer( IVirtualComponent component )
-  {
-    return null;
-  }
-  
-  public static IServer getDefaultExistingServer(IProject project) {
-    String defaultServerName;
-
-    //IServerPreferences serverPreferences = ServerCore.getServerPreferences();
-    IProjectProperties props = ServerCore.getProjectProperties(project);
-    IServer preferredServer = props.getDefaultServer();
-    //IServer preferredServer = serverPreferences.getDeployableServerPreference(ResourceUtils.getModule(project));
-    if (preferredServer != null)
-      return preferredServer;
-
-    IServer[] configuredServers = ServerUtil.getServersByModule(ResourceUtils.getModule(project), null);
-    if (configuredServers != null && configuredServers.length > 0) { return configuredServers[0]; }
-
-    IServer[] nonConfiguredServers = ServerUtil.getAvailableServersForModule(ResourceUtils.getModule(project), false, null);
-    if (nonConfiguredServers != null && nonConfiguredServers.length > 0) { return nonConfiguredServers[0]; }
-    return null;
-  }
-  
-  
-  /*
-   * @param moduleType - ad defined in IServerTargetConstants (i.e. EAR_TYPE, WEB_TYPE, etc.)
-   * @param j2eeVersion String representation of the int values in J2EEVersionConstants
-   * i.e. "12" or "13" or "14"
-   * @return String the id of the server target - to be used in project creation operations.
-   */
-  public static String getServerTargetIdFromFactoryId(String serverFactoryId, String moduleType, String j2eeVersion)
-  {
-    IServerType serverType = ServerCore.findServerType(serverFactoryId);
-    if (serverType == null)
-      return null;
-    
-    String serverRuntimeTypeId = serverType.getRuntimeType().getId();
-    
-    String stJ2EEVersion = ServerUtils.getServerTargetJ2EEVersion(j2eeVersion);
-    List runtimes = ServerTargetHelper.getServerTargets(moduleType, stJ2EEVersion);
-    for (int i=0; i<runtimes.size(); i++)
-    {
-      IRuntime runtime = (IRuntime)runtimes.get(i);
-      String thisRuntimeTypeId = runtime.getRuntimeType().getId();
-      if (thisRuntimeTypeId.equals(serverRuntimeTypeId))
-      {
-        return runtime.getId();
-      }
-    }
-    
-    return null;    
-  }
-  
-  /*
-   * @param serverFactoryId the server's factory id
-   * @returns the runtime type id given the server's factory id. Returns a blank String if the no ServerType exists for the given factory id.
-   */
-  public static String getRuntimeTargetIdFromFactoryId(String serverFactoryId)
-  {
-    IServerType serverType = ServerCore.findServerType(serverFactoryId);
-    if (serverType!=null)
-    {
-      String serverRuntimeId = serverType.getRuntimeType().getId();
-      return serverRuntimeId;
-    }
-    else
-      return "";
-  }
-  
-  /*
-   * @param serverFactoryId the server's factory id
-   * @returns the server type id given the server's factory id. Returns a blank String if the no ServerType exists for the given factory id.
-   */  
-  public static String getServerTypeIdFromFactoryId(String serverFactoryId)
-  {
-  	IServerType serverType = ServerCore.findServerType(serverFactoryId);
-  	if (serverType!=null)
-  	{
-  	  String serverTypeId = serverType.getId();
-  	  return serverTypeId;
-  	}
-  	else
-  	  return "";
-  }
-
-  /*
-   * @param j2eeVersion String representation of the int values in J2EEVersionConstants
-   * i.e. "12" or "13" or "14"
-   */
-  public static boolean isTargetValidForEAR(String runtimeTargetId, String j2eeVersion)
-  {
-  	if (runtimeTargetId == null)
-  		return false;
-  	
-  	String earModuleType = IServerTargetConstants.EAR_TYPE;
-	String stJ2EEVersion = ServerUtils.getServerTargetJ2EEVersion(j2eeVersion);
-  	List runtimes = ServerTargetHelper.getServerTargets(earModuleType, stJ2EEVersion);
-    for (int i=0; i<runtimes.size(); i++ )
-    {
-      IRuntime runtime = (IRuntime)runtimes.get(i);
-      String thisId = runtime.getRuntimeType().getId();
-      if (thisId.equals(runtimeTargetId))
-      	return true;
-    }
-    
-    return false;
-  }
-  /*
-   * @param j2eeVersion String representation of the int values in J2EEVersionConstants
-   * i.e. "12" or "13" or "14"
-   * @param the project type from IServerTargetConstants
-   */
-  public static boolean isTargetValidForProjectType(String runtimeTargetId, String j2eeVersion, String projectType)
-  {
-  	if (runtimeTargetId == null)
-  		return false;
-  	
-  	if (projectType==null || projectType.length()==0)
-  	  return false;
-  	
-  	String stJ2EEVersion = ServerUtils.getServerTargetJ2EEVersion(j2eeVersion);
-  	List runtimes = ServerTargetHelper.getServerTargets(projectType, stJ2EEVersion);
-    for (int i=0; i<runtimes.size(); i++ )
-    {
-      IRuntime runtime = (IRuntime)runtimes.get(i);
-      String thisId = runtime.getRuntimeType().getId();
-      if (thisId.equals(runtimeTargetId))
-      	return true;
-    }
-    
-    return false;
-  }
-  
-  public static String getServerTargetJ2EEVersion(String j2eeVersion)
-  {
-    String stJ2EEVersion = null;
-    if (j2eeVersion==null || j2eeVersion.length()==0)
-      return null;
-    
-    int j2eeVersionInt = Integer.parseInt(j2eeVersion);
-    switch (j2eeVersionInt)
-    {
-      case (J2EEVersionConstants.J2EE_1_2_ID):
-        return IServerTargetConstants.J2EE_12;
-      case (J2EEVersionConstants.J2EE_1_3_ID):
-        return IServerTargetConstants.J2EE_13;
-      case (J2EEVersionConstants.J2EE_1_4_ID):
-        return IServerTargetConstants.J2EE_14;
-      default:
-        return null;
-    }
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/StatusObjectHandler.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/StatusObjectHandler.java
deleted file mode 100644
index 52f0fe9..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/StatusObjectHandler.java
+++ /dev/null
@@ -1,141 +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.common;
-
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.common.util.WrappedException;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-
-
-public class StatusObjectHandler
-{
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-  private static final int MAX_DETAILS = 16;
-
-  public static IStatus generateTreeStatus (IStatus status) 
-  	{
-    //
-    // There could be lots of Throwables, CoreExceptions,
-    // WrappedExceptions and IStatus objects beneath the
-    // given status. Find them.
-    //
-    LinkedList statusList = new LinkedList();
-    appendStatus(MAX_DETAILS, statusList, status, status.getSeverity());
-    if (statusList.size() > 0)
-    {
-      IStatus newStatus = (IStatus)statusList.removeFirst();
-      if (statusList.size() > 0)
-      {
-        IStatus[] secondaryStatusArray = new IStatus[statusList.size()];
-        int n = 0;
-        Iterator i = statusList.iterator();
-        while (i.hasNext())
-        {
-          secondaryStatusArray[n++] = (IStatus)i.next();
-        }
-        newStatus = new MultiStatus(status.getPlugin(),status.getCode(),secondaryStatusArray,status.getMessage(),status.getException());
-      }
-      return newStatus;
-    }
-    else 
-    	return null;
-  }
-
-  //
-  // Appends zero or more IStatus objects to the list of IStatus objects
-  // based upon an IStatus.
-  //
-  private static int appendStatus ( int max, List statusList, IStatus status, int severity )
-  {
-    if (max > 0 && status != null)
-    {
-      //
-      // Append an IStatus object for the given status' message.
-      //
-      if (status.getMessage() != null)
-      {
-        max = append(statusList,max,severity,status.getPlugin(),status.getCode(),status.getMessage(),status.getException());
-      }
-      //
-      // Append the IStatus' Throwable, if any.
-      //
-      max = appendThrowable(max,statusList,status.getException(),severity);
-      //
-      // If the IStatus is a multi status, append the children.
-      //
-      IStatus[] children = status.getChildren();
-      for (int i=0; i<children.length && max>0; i++)
-      {
-        max = appendStatus(max,statusList,children[i],severity);
-      }
-    }
-    return max;
-  }
-
-  //
-  // Appends zero or more IStatus objects to the list of IStatus objects
-  // based upon a Throwable. WrappedExceptions and CoreExceptions are
-  // given special treatment.
-  //
-  private static int appendThrowable ( int max, List statusList, Throwable throwable, int severity )
-  {
-    if (max > 0 && throwable != null)
-    {
-      //
-      // Append an IStatus object for the exception's message.
-      //
-      if (throwable.getLocalizedMessage() != null)
-      {
-        max = append(statusList,max,severity,WebServicePlugin.ID,0,throwable.getLocalizedMessage(),throwable);
-      }
-      //
-      // If the exception is a WrappedException, append the wrapped Exception.
-      //
-      if (throwable instanceof WrappedException)
-      {
-        WrappedException wexc = (WrappedException)throwable;
-        max = appendThrowable(max,statusList,wexc.exception(),severity);
-      }
-      //
-      // If the exception is a CoreException, append the enclosed IStatus.
-      //
-      if (throwable instanceof CoreException)
-      {
-        CoreException cexc = (CoreException)throwable;
-        max = appendStatus(max,statusList,cexc.getStatus(),severity);
-      }
-    }
-    return max;
-  }
-
-  //
-  // Creates and appends an IStatus to the list of IStatus objects.
-  //
-  private static int append ( List statusList, int max, int severity, String id, int code, String message, Throwable throwable )
-  {
-    if (max > 0)
-    {
-      IStatus status = new Status(severity,id,code,message,throwable);
-      statusList.add(status);
-      max--;
-    }
-    return max;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/StringToIProjectTransformer.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/StringToIProjectTransformer.java
deleted file mode 100644
index d833e13..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/StringToIProjectTransformer.java
+++ /dev/null
@@ -1,37 +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.common;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.wst.command.env.common.FileResourceUtils;
-import org.eclipse.wst.command.env.core.data.Transformer;
-
-
-/**
- * Transfroms a java.lang.String to an org.eclipse.core.runtime.IProject
- */
-public class StringToIProjectTransformer implements Transformer
-{
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.core.data.Transformer#transform(java.lang.Object)
-   * @param Object This must be a java.lang.String
-   * @return Object Returns an IProject
-   */
-  public Object transform(Object value)
-  {
-    IProject project = null;
-    String valueString = (String)value;
-    if (valueString.length() > 0)
-      project = FileResourceUtils.getWorkspaceRoot().getProject((String)value);
-    
-    return project;    
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/StringUtils.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/StringUtils.java
deleted file mode 100644
index 5d9fd9b..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/StringUtils.java
+++ /dev/null
@@ -1,289 +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.common;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Enumeration;
-import java.util.Vector;
-
-import org.eclipse.jdt.core.JavaConventions;
-
-/**
-  * 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
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  /**
-  * 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.
-  **/
-  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.
-  **/
-  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;
-  }
-
-  private static final char[] URI_SYMBOLS = {'-', '~', '#', '/', '.'};
-  private static final char UNDERSCORE = '_';
-
-
-  /**
-   * This returns a valid Java identifier based on the given name. 
-   * (follows JAX-RPC 1.0 Public Review Draft 2 recommendations)
-   */
-  public static String javaIdentifierFor(String localName)
-  {
-    StringBuffer result = new StringBuffer();
-    boolean skipped = false;
-    for (int i = 0, length = localName.length(); i < length; ++i)
-    {
-      char character = localName.charAt(i);
-      if (Character.isJavaIdentifierPart(character) && !isDelimiter(character))
-      {
-        if (skipped && result.length() != 0)
-        {
-          character = Character.toUpperCase(character);
-        }
-        result.append(character);
-        skipped = false;
-      }
-      else
-      {
-        skipped =true;
-      }
-    }
-
-    if (!JavaConventions.validateIdentifier(result.toString()).isOK())
-    {
-      result.insert(0, "_");
-    }
-
-    return result.toString();
-  }
-
-  private static boolean isDelimiter(char character)
-  {
-    return "\u002D\u002E\u003A\u005F\u00B7\u0387\u06DD\u06DE".indexOf(character) != -1;
-  }
-  
-  
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/PersistentProjectTopologyContext.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/PersistentProjectTopologyContext.java
deleted file mode 100644
index a0a666d..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/PersistentProjectTopologyContext.java
+++ /dev/null
@@ -1,76 +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.context;
-
-import java.util.StringTokenizer;
-
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.wst.command.env.context.PersistentContext;
-
-
-public class PersistentProjectTopologyContext extends PersistentContext implements ProjectTopologyContext
-{
-
-public PersistentProjectTopologyContext () 
-{
-	super( WebServicePlugin.getInstance());
-}
- public void load() {
-    String[] ids = ProjectTopologyDefaults.getClientTypes();
-    StringBuffer sb = new StringBuffer();
-    for (int i = 0; i < ids.length; i++)
-    {
-      if (i != 0)
-        sb.append(" ");
-      sb.append(ids[i]);
-    }
-    setDefault(PREFERENCE_CLIENT_TYPES, sb.toString());
-    setDefault(PREFERENCE_USE_TWO_EARS, ProjectTopologyDefaults.isUseTwoEARs());
- }
-
- public void setClientTypes(String[] ids)
- {
-   StringBuffer sb = new StringBuffer();
-   for (int i = 0; i < ids.length; i++)
-   {
-     if (i != 0)
-       sb.append(" ");
-     sb.append(ids[i]);
-   }
-   setValue(PREFERENCE_CLIENT_TYPES, sb.toString());
- }
-
- public String[] getClientTypes()
- {
-   StringTokenizer st = new StringTokenizer(getValueAsString(PREFERENCE_CLIENT_TYPES));
-   String[] s = new String[st.countTokens()];
-   for (int i = 0; i < s.length; i++)
-     s[i] = st.nextToken();
-   return s;
- }
-
- public void setUseTwoEARs(boolean use)
- {
-   setValue(PREFERENCE_USE_TWO_EARS, use);
- }
- public boolean isUseTwoEARs()
- {
-   return getValueAsBoolean(PREFERENCE_USE_TWO_EARS);
- }
-
- public ProjectTopologyContext copy() {
- 	TransientProjectTopologyContext context = new TransientProjectTopologyContext();
-	context.setClientTypes(getClientTypes());
-	context.setUseTwoEARs(isUseTwoEARs());
-	return context;
-}
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/PersistentScenarioContext.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/PersistentScenarioContext.java
deleted file mode 100644
index 9eaf046..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/PersistentScenarioContext.java
+++ /dev/null
@@ -1,274 +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.context;
-
-import java.util.StringTokenizer;
-
-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.env.context.PersistentContext;
-
-
-public class PersistentScenarioContext extends PersistentContext implements ScenarioContext
-{
-  public PersistentScenarioContext()
-  {
-    super(WebServicePlugin.getInstance()); 
-  }
-
-  public void load()
-  {
-    ScenarioDefaults defaults = new ScenarioDefaults();
-    String[] ids = defaults.getWebServiceTestTypes();
-    StringBuffer sb = new StringBuffer();
-    for (int i = 0; i < ids.length; i++)
-    {
-      if (i != 0) sb.append(",");
-      sb.append(ids[i]);
-    }
-    String nonJavaTestService = defaults.getNonJavaTestServiceDefault();
-    setDefaultStringIfNoDefault(PREFERENCE_WEBSERVICE_TEST_TYPES, sb.toString());
-    setDefaultStringIfNoDefault(PREFERENCE_NON_JAVA_TEST_SERVICE, nonJavaTestService);
-    
-    setDefaultStringIfNoDefault(PREFERENCE_CLIENT_WEBSERVICE_TYPE, defaults.webserviceClientTypeDefault() );
-    setDefaultStringIfNoDefault(PREFERENCE_WEBSERVICE_TYPE, defaults.webserviceTypeIdDefault() );
-    setDefaultBooleanIfNoDefault(PREFERENCE_GENERATE_PROXY, defaults.generateProxyDefault() );
-    setDefaultBooleanIfNoDefault(PREFERENCE_LAUNCH_WEBSERVICE_EXPLORER, defaults.launchWebserviceExplorerDefault() );
-    setDefaultBooleanIfNoDefault(PREFERENCE_START_WEBSERVICE, defaults.startWebserviceDefault() );
-    setDefaultBooleanIfNoDefault(PREFERENCE_TEST_WEBSERVICE, defaults.testWebserviceDefault() );
-    setDefaultBooleanIfNoDefault(PREFERENCE_MONITOR_WEBSERVICE, defaults.getMonitorWebServiceDefault());
-    setDefaultBooleanIfNoDefault(PREFERENCE_LAUNCH_SAMPLE, defaults.launchSample() );
-  }
-
-  public String getNonJavaTestService()
-  {
-    WebServiceTestRegistry registry = WebServiceTestRegistry.getInstance();
-    String[] testTypes = getWebServiceTestTypes();
-    for (int i = 0; i < testTypes.length; i++)
-    {
-      WebServiceTestExtension wse = (WebServiceTestExtension) registry
-          .getWebServiceExtensionsByName(testTypes[i]);
-      if (!wse.isJava()) return testTypes[i];
-    }
-    return "";
-  }
-  
-  public void setWebServiceTestTypes(String[] ids)
-  {
-    StringBuffer sb = new StringBuffer();
-    for (int i = 0; i < ids.length; i++)
-    {
-      if (i != 0) sb.append(",");
-      sb.append(ids[i]);
-    }
-    setValue(PREFERENCE_WEBSERVICE_TEST_TYPES, sb.toString());
-  }
-
-  public String[] getWebServiceTestTypes()
-  {
-    StringTokenizer st = new StringTokenizer(
-        getValueAsString(PREFERENCE_WEBSERVICE_TEST_TYPES), ",");
-    String[] s = new String[st.countTokens()];
-    for (int i = 0; i < s.length; i++)
-      s[i] = st.nextToken();
-    return s;
-  }
-
-  public ScenarioContext copy()
-  {
-    TransientScenarioContext context = new TransientScenarioContext();
-    context.setWebServiceTestTypes(getWebServiceTestTypes());
-    context.setNonJavaTestService(getNonJavaTestService());
-    
-    context.setClientWebServiceType( getClientWebServiceType() );
-    context.setWebServiceType( getWebServiceType() );
-    context.setLaunchWebServiceExplorer( getLaunchWebServiceExplorer() );
-    context.setStartWebService( getStartWebService() );
-    context.setGenerateProxy( getGenerateProxy() );
-    context.setTestWebService( getTestWebService() );
-    context.setMonitorWebService(getMonitorWebService());
-    context.setLaunchSampleEnabled( isLaunchSampleEnabled() );
-    
-    return context;
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getClientWebServiceType()
-   */
-  public String getClientWebServiceType()
-  {
-    return getValueAsString(PREFERENCE_CLIENT_WEBSERVICE_TYPE);
-  }
-  
-  public String getClientWebServiceTypeDefault()
-  {
-    return getDefaultString(PREFERENCE_CLIENT_WEBSERVICE_TYPE);
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getGenerateProxy()
-   */
-  public boolean getGenerateProxy()
-  {
-    return getValueAsBoolean(PREFERENCE_GENERATE_PROXY);
-  }
-  
-  public boolean getGenerateProxyDefault()
-  {
-    return getDefaultBoolean(PREFERENCE_GENERATE_PROXY);
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getLaunchWebServiceExplorer()
-   */
-  public boolean getLaunchWebServiceExplorer()
-  {
-    return getValueAsBoolean(PREFERENCE_LAUNCH_WEBSERVICE_EXPLORER);
-  }
-  
-  public boolean getLaunchWebServiceExplorerDefault()
-  {
-    return getDefaultBoolean(PREFERENCE_LAUNCH_WEBSERVICE_EXPLORER);
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getStartWebService()
-   */
-  public boolean getStartWebService()
-  {
-    return getValueAsBoolean(PREFERENCE_START_WEBSERVICE);
-  }
-  
-  public boolean getStartWebServiceDefault()
-  {
-    return getDefaultBoolean(PREFERENCE_START_WEBSERVICE);
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getTestWebService()
-   */
-  public boolean getTestWebService()
-  {
-    return getValueAsBoolean(PREFERENCE_TEST_WEBSERVICE);
-  }
-  
-  public boolean getTestWebServiceDefault()
-  {
-    return getDefaultBoolean(PREFERENCE_TEST_WEBSERVICE);
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getWebServiceType()
-   */
-  public String getWebServiceType()
-  {
-    return getValueAsString(PREFERENCE_WEBSERVICE_TYPE);
-  }
-  
-  public String getWebServiceTypeDefault()
-  {
-    return getDefaultString(PREFERENCE_WEBSERVICE_TYPE);
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setClientWebServiceType(java.lang.String)
-   */
-  public void setClientWebServiceType(String value)
-  {
-    setValue( PREFERENCE_CLIENT_WEBSERVICE_TYPE, value);
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setGenerateProxy(boolean)
-   */
-  public void setGenerateProxy(boolean value)
-  {
-    setValue( PREFERENCE_GENERATE_PROXY, value);
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setLaunchWebServiceExplorer(boolean)
-   */
-  public void setLaunchWebServiceExplorer(boolean value)
-  {
-    setValue( PREFERENCE_LAUNCH_WEBSERVICE_EXPLORER, value);
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setStartWebService(boolean)
-   */
-  public void setStartWebService(boolean value)
-  {
-    setValue( PREFERENCE_START_WEBSERVICE, value);
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setTestWebService(boolean)
-   */
-  public void setTestWebService(boolean value)
-  {
-    setValue( PREFERENCE_TEST_WEBSERVICE, value);
-  }
-  /* (non-Javadoc)
-   * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setWebServiceType(java.lang.String)
-   */
-  public void setWebServiceType(String value)
-  {
-    setValue( PREFERENCE_WEBSERVICE_TYPE, value);
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getMonitorWebService()
-   */
-  public boolean getMonitorWebService()
-  {
-    return getValueAsBoolean(PREFERENCE_MONITOR_WEBSERVICE);
-  }
-  
-  public boolean getMonitorWebServiceDefault()
-  {
-    return getDefaultBoolean(PREFERENCE_MONITOR_WEBSERVICE);
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setMonitorWebService(boolean)
-   */
-  public void setMonitorWebService(boolean value)
-  {
-    setValue(PREFERENCE_MONITOR_WEBSERVICE, value);
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getLaunchSampleEnabledDefault()
-   */
-  public boolean getLaunchSampleEnabledDefault()
-  {
-    return getDefaultBoolean(PREFERENCE_LAUNCH_SAMPLE);
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.jst.ws.internal.context.ScenarioContext#isLaunchSampleEnabled()
-   */
-  public boolean isLaunchSampleEnabled()
-  {
-    return getValueAsBoolean(PREFERENCE_LAUNCH_SAMPLE);
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setLaunchSampleEnabled(boolean)
-   */
-  public void setLaunchSampleEnabled(boolean value)
-  {
-    setValue( PREFERENCE_LAUNCH_SAMPLE, value);
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/PersistentUDDIPreferenceContext.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/PersistentUDDIPreferenceContext.java
deleted file mode 100644
index f4db2de..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/PersistentUDDIPreferenceContext.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.context;
-
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.wst.command.env.context.PersistentContext;
-
-
-public class PersistentUDDIPreferenceContext extends PersistentContext implements UDDIPreferenceContext
-{
-  public PersistentUDDIPreferenceContext()
-  {
-    super(WebServicePlugin.getInstance());
-  }
-
-  public void load()
-  {
-    setDefault(PREFERENCE_UDDI_CAT_DATA_COLUMN_DELIMITER, UDDIPreferenceDefaults.getUddiCatDataColumnDelimiter());
-    setDefault(PREFERENCE_UDDI_CAT_DATA_STRING_DELIMITER, UDDIPreferenceDefaults.getUddiCatDataStringDelimiter());
-  }
-
-  public void setUddiCatDataColumnDelimiter(String delimiter)
-  {
-    setValue(PREFERENCE_UDDI_CAT_DATA_COLUMN_DELIMITER, delimiter);
-  }
-
-  public String getUddiCatDataColumnDelimiter()
-  {
-    return getValueAsString(PREFERENCE_UDDI_CAT_DATA_COLUMN_DELIMITER);
-  }
-
-  public void setUddiCatDataStringDelimiter(String delimiter)
-  {
-    setValue(PREFERENCE_UDDI_CAT_DATA_STRING_DELIMITER, delimiter);
-  }
-
-  public String getUddiCatDataStringDelimiter()
-  {
-    return getValueAsString(PREFERENCE_UDDI_CAT_DATA_STRING_DELIMITER);
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/ProjectTopologyContext.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/ProjectTopologyContext.java
deleted file mode 100644
index 616d335..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/ProjectTopologyContext.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 Eclipse Public License v1.0
- * which accompanies 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.context;
-
-public interface ProjectTopologyContext 
-{
-  /**
-    * This constant String is used to lookup the preferred order of the different client types
-  **/
-  public static final String PREFERENCE_CLIENT_TYPES = "clientTypes";
-  
-  /**
-    * This constant String is used to lookup the two EAR option
-  **/
-  public static final String PREFERENCE_USE_TWO_EARS = "useTwoEARs";
-  
-  public void setClientTypes(String[] ids);
-  public String[] getClientTypes();
-
-  public void setUseTwoEARs(boolean use);
-  public boolean isUseTwoEARs();
-
-  public ProjectTopologyContext copy();
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/ProjectTopologyDefaults.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/ProjectTopologyDefaults.java
deleted file mode 100644
index b20c609..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/ProjectTopologyDefaults.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 Eclipse Public License v1.0
- * which accompanies 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.context;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-
-public class ProjectTopologyDefaults
-{
-  public static final String[] getClientTypes()
-  {
-    IExtensionRegistry reg = Platform.getExtensionRegistry();
-    IConfigurationElement[] elements = reg.getConfigurationElementsFor("org.eclipse.jst.ws.consumption.ui", "clientProjectType");
-    String[] types = new String[elements.length];
-    for (int i = 0; i < types.length; i++)
-      types[i] = elements[i].getAttribute("id");
-    return types;
-  }
-
-  public static final boolean isUseTwoEARs()
-  {
-    return true;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/ScenarioContext.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/ScenarioContext.java
deleted file mode 100644
index 9bcbd24..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/ScenarioContext.java
+++ /dev/null
@@ -1,73 +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.context;
-
-public interface ScenarioContext 
-{
-  public final String PREFERENCE_WEBSERVICE_TEST_TYPES = "webServiceTestTypes";
-    
-  public final String PREFERENCE_NON_JAVA_TEST_SERVICE= "nonJavaTestService";
-  
-  public final String PREFERENCE_WEBSERVICE_TYPE = "webServiceType";
-  
-  public final String PREFERENCE_START_WEBSERVICE = "startWebService";
-  
-  public final String PREFERENCE_LAUNCH_WEBSERVICE_EXPLORER = "launchWebServiceExplorer";
-  
-  public final String PREFERENCE_GENERATE_PROXY = "generateProxy";
-  
-  public final String PREFERENCE_CLIENT_WEBSERVICE_TYPE = "clientWebServiceType";
-  
-  public final String PREFERENCE_TEST_WEBSERVICE = "testWebService";
-  
-  public final String PREFERENCE_MONITOR_WEBSERVICE = "monitorWebService";
-  
-  public final String PREFERENCE_LAUNCH_SAMPLE = "launchSample";
-  
-  public String[] getWebServiceTestTypes();
-  public void setWebServiceTestTypes(String[] testTypes);
-  
-  public String getNonJavaTestService();
-  
-  public String getWebServiceType();
-  public String getWebServiceTypeDefault();
-  public void   setWebServiceType( String value );
-  
-  public boolean getStartWebService();
-  public boolean getStartWebServiceDefault();
-  public void    setStartWebService( boolean value );
-  
-  public boolean getLaunchWebServiceExplorer();
-  public boolean getLaunchWebServiceExplorerDefault();
-  public void    setLaunchWebServiceExplorer( boolean value );
-  
-  public boolean getGenerateProxy();
-  public boolean getGenerateProxyDefault();
-  public void    setGenerateProxy( boolean value );
-  
-  public String getClientWebServiceType();
-  public String getClientWebServiceTypeDefault();
-  public void   setClientWebServiceType( String value );
-  
-  public boolean getTestWebService();
-  public boolean getTestWebServiceDefault();
-  public void    setTestWebService( boolean value );
-  
-  public boolean getMonitorWebService();
-  public boolean getMonitorWebServiceDefault();
-  public void setMonitorWebService(boolean value);
-  
-  public boolean isLaunchSampleEnabled();
-  public boolean getLaunchSampleEnabledDefault();
-  public void    setLaunchSampleEnabled( boolean value );
-  
-  public ScenarioContext copy();
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/ScenarioDefaults.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/ScenarioDefaults.java
deleted file mode 100644
index 85ea814..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/ScenarioDefaults.java
+++ /dev/null
@@ -1,97 +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.context;
-
-
-import org.eclipse.jst.ws.internal.data.LabelsAndIds;
-import org.eclipse.jst.ws.internal.ext.test.WebServiceTestRegistry;
-
-
-
-public class ScenarioDefaults
-{  
-  
-	
-  public String[] getWebServiceTestTypes()
-  {
-  	//we will set the home grown sample as the first choice
-  	WebServiceTestRegistry testRegistry = WebServiceTestRegistry.getInstance();
-  	
-  	LabelsAndIds labelsandids = testRegistry.getLabelsAndIDs();
-  	String[] labels = labelsandids.getLabels_();
-  	String[] ids = labelsandids.getIds_();
-  	
-  	String[] newNames = new String[labels.length];
-  	int index = -1;
-  	for(int i = 0;i<ids.length;i++){
-  	  if(ids[i].equals("org.eclipse.jst.ws.internal.consumption.ui.widgets.test.WebServiceSampleTest"))  	
-  	    index = i;   
-  	}
-  	if(index != -1){
-  	  newNames[0] = labels[index];
-  	  int j = 1;
-  	  for(int i = 0;i<labels.length;i++){
-  	    if(i != index){
-  	  	  newNames[j] = labels[i]; 
-  	      j++;
-  	    }
-  	  }
-  	}
-  	else return labels;
-  	
-  	return newNames;
-  }
-  
-  public String getNonJavaTestServiceDefault()
-  {
-    return "Web Services Explorer";	
-  } 
-  
-  public String webserviceTypeIdDefault()
-  {
-    return "org.eclipse.jst.ws.type.java";
-  }
-  
-  public boolean startWebserviceDefault()
-  {
-    return true;
-  }
-  
-  public boolean launchWebserviceExplorerDefault()
-  {
-    return false;
-  }
-  
-  public boolean generateProxyDefault()
-  {
-    return false;
-  }
-  
-  public String webserviceClientTypeDefault()
-  {
-    return "org.eclipse.jst.ws.client.type.java";
-  }
-  
-  public boolean testWebserviceDefault()
-  {
-    return false;
-  }
-
-  public boolean getMonitorWebServiceDefault()
-  {
-    return false;
-  }
-  
-  public boolean launchSample()
-  {
-    return true;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/TransientProjectTopologyContext.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/TransientProjectTopologyContext.java
deleted file mode 100644
index e4a289b..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/TransientProjectTopologyContext.java
+++ /dev/null
@@ -1,46 +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.context;
-
-
-public class TransientProjectTopologyContext implements ProjectTopologyContext
-{
- private String[] clientTypes;
- private boolean twoEARs;
- 
- public TransientProjectTopologyContext () {}
-
- public void setClientTypes(String[] clientTypes)
- {
-   this.clientTypes = clientTypes;
- }
- public String[] getClientTypes()
- {
-   return clientTypes;
- }
-
- public void setUseTwoEARs(boolean use)
- {
-   this.twoEARs = use;
- }
- public boolean isUseTwoEARs()
- {
-   return twoEARs;
- }
-
- public ProjectTopologyContext copy() {
- 	TransientProjectTopologyContext context = new TransientProjectTopologyContext();
-	context.setClientTypes(getClientTypes());
-	context.setUseTwoEARs(isUseTwoEARs());
-	return context;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/TransientScenarioContext.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/TransientScenarioContext.java
deleted file mode 100644
index 8730619..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/TransientScenarioContext.java
+++ /dev/null
@@ -1,218 +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.context;
-
-public class TransientScenarioContext implements ScenarioContext
-{
-  private String[] webServiceTestTypes;
-  private String   nonJavaTestService;
-  private String   webServiceType_;
-  private boolean  startWebService_;
-  private boolean  launchWebServiceExplorer_;
-  private boolean  generateProxy_;
-  private String   clientWebServiceType_;
-  private boolean  testWebService_;
-  private boolean  monitorWebService;
-  private boolean  launchSample_;
-  
-  private ScenarioDefaults defaults = new ScenarioDefaults();
- 
-  public TransientScenarioContext () {}
-
-  public String getNonJavaTestService()
-  {
-    return nonJavaTestService;
-  }
- 
-  public void setNonJavaTestService(String nonJavaTestService)
-  {
-    this.nonJavaTestService = nonJavaTestService;	
-  }
- 
-  public void setWebServiceTestTypes(String[] webServiceTestTypes)
-  {
-    this.webServiceTestTypes = webServiceTestTypes;
-  }
-  
-  public String[] getWebServiceTestTypes()
-  {
-    return webServiceTestTypes;	
-  }
- 
-  public ScenarioContext copy() {
-  	TransientScenarioContext context = new TransientScenarioContext();
-	context.setWebServiceTestTypes(getWebServiceTestTypes());
-	context.setNonJavaTestService(getNonJavaTestService());
-	
-	context.setWebServiceType( getWebServiceType() );
-	context.setClientWebServiceType( getClientWebServiceType() );
-	context.setGenerateProxy( getGenerateProxy() );
-	context.setLaunchWebServiceExplorer( getLaunchWebServiceExplorer() );
-	context.setStartWebService( getStartWebService() );
-	context.setTestWebService( getTestWebService() );
-	context.setMonitorWebService(getMonitorWebService());
-	context.setLaunchSampleEnabled( isLaunchSampleEnabled() );
-	return context;
-  }
- 
-  /* (non-Javadoc)
-   * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getClientWebServiceType()
-   */
-  public String getClientWebServiceType()
-  {
-    return clientWebServiceType_;
-  }
-  
-  public String getClientWebServiceTypeDefault(){ return defaults.webserviceClientTypeDefault(); }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getGenerateProxy()
-   */
-  public boolean getGenerateProxy()
-  {
-    return generateProxy_;
-  }
-  
-  public boolean getGenerateProxyDefault(){ return defaults.generateProxyDefault(); }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getLaunchWebServiceExplorer()
-   */
-  public boolean getLaunchWebServiceExplorer()
-  {
-    return launchWebServiceExplorer_;
-  }
-  
-  public boolean getLaunchWebServiceExplorerDefault(){ return defaults.launchWebserviceExplorerDefault(); }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getStartWebService()
-   */
-  public boolean getStartWebService()
-  {
-    return startWebService_;
-  }
-  
-  public boolean getStartWebServiceDefault(){ return defaults.startWebserviceDefault(); }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getTestWebService()
-   */
-  public boolean getTestWebService()
-  {
-    return testWebService_;
-  }
-  
-  public boolean getTestWebServiceDefault(){ return defaults.testWebserviceDefault(); }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getWebServiceType()
-   */
-  public String getWebServiceType()
-  {
-    return webServiceType_;
-  }
-  
-  public String getWebServiceTypeDefault(){ return defaults.webserviceTypeIdDefault(); }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setClientWebServiceType(java.lang.String)
-   */
-  public void setClientWebServiceType(String value)
-  {
-    clientWebServiceType_ = value;
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setGenerateProxy(boolean)
-   */
-  public void setGenerateProxy(boolean value)
-  {
-    generateProxy_ = value;
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setLaunchWebServiceExplorer(boolean)
-   */
-  public void setLaunchWebServiceExplorer(boolean value)
-  {
-    launchWebServiceExplorer_ = value;
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setStartWebService(boolean)
-   */
-  public void setStartWebService(boolean value)
-  {
-    startWebService_ = value;
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setTestWebService(boolean)
-   */
-  public void setTestWebService(boolean value)
-  {
-    testWebService_ = value;
-  }
-  /* (non-Javadoc)
-   * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setWebServiceType(java.lang.String)
-   */
-  public void setWebServiceType(String value)
-  {
-    webServiceType_ = value;
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getMonitorWebService()
-   */
-  public boolean getMonitorWebService()
-  {
-    return monitorWebService;
-  }
-  
-  public boolean getMonitorWebServiceDefault()
-  {
-    return defaults.getMonitorWebServiceDefault();
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setMonitorWebService(boolean)
-   */
-  public void setMonitorWebService(boolean value)
-  {
-    monitorWebService = value;
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getLaunchSampleEnabledDefault()
-   */
-  public boolean getLaunchSampleEnabledDefault()
-  {
-    return defaults.launchSample();
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.jst.ws.internal.context.ScenarioContext#isLaunchSampleEnabled()
-   */
-  public boolean isLaunchSampleEnabled()
-  {
-    return launchSample_;
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setLaunchSampleEnabled(boolean)
-   */
-  public void setLaunchSampleEnabled(boolean value)
-  {
-    launchSample_ = value;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/UDDIPreferenceContext.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/UDDIPreferenceContext.java
deleted file mode 100644
index a24addb..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/UDDIPreferenceContext.java
+++ /dev/null
@@ -1,31 +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.context;
-
-public interface UDDIPreferenceContext 
-{
-  /*
-   * This constant String is used to lookup the column delimiter for user-defined UDDI
-   * Category data.
-   */
-  public static final String PREFERENCE_UDDI_CAT_DATA_COLUMN_DELIMITER = "uddiCatDataColumnDelimiter";
-  
-  /*
-   * This constant String is used to lookup the string delimiter for user-defined UDDI
-   * Category data.
-   */
-  public static final String PREFERENCE_UDDI_CAT_DATA_STRING_DELIMITER = "uddiCatDataStringDelimiter";
-  
-  public void setUddiCatDataColumnDelimiter(String delimiter);
-  public String getUddiCatDataColumnDelimiter();
-  public void setUddiCatDataStringDelimiter(String delimiter);
-  public String getUddiCatDataStringDelimiter();
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/UDDIPreferenceDefaults.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/UDDIPreferenceDefaults.java
deleted file mode 100644
index 39eba91..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/UDDIPreferenceDefaults.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.jst.ws.internal.context;
-
-public class UDDIPreferenceDefaults
-{
-  public static final String getUddiCatDataColumnDelimiter()
-  {
-    return "#";
-  }
-  
-  public static final String getUddiCatDataStringDelimiter()
-  {
-    return "\"";
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/data/LabelsAndIds.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/data/LabelsAndIds.java
deleted file mode 100644
index 4bd0f64..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/data/LabelsAndIds.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.jst.ws.internal.data;
-
-public class LabelsAndIds
-{
-  private String[] labels_;
-  private String[] ids_;
-  
-  /**
-   * @return Returns the ids_.
-   */
-  public String[] getIds_()
-  {
-    return ids_;
-  }
-  /**
-   * @param ids_ The ids_ to set.
-   */
-  public void setIds_(String[] ids_)
-  {
-    this.ids_ = ids_;
-  }
-  /**
-   * @return Returns the labels_.
-   */
-  public String[] getLabels_()
-  {
-    return labels_;
-  }
-  /**
-   * @param labels_ The labels_ to set.
-   */
-  public void setLabels_(String[] labels_)
-  {
-    this.labels_ = labels_;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/data/TypeRuntimeServer.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/data/TypeRuntimeServer.java
deleted file mode 100644
index 4dc349d..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/data/TypeRuntimeServer.java
+++ /dev/null
@@ -1,86 +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.data;
-
-public class TypeRuntimeServer
-{
-  private String typeId_     = "";
-  private String runtimeId_  = "";
-  private String serverId_   = "";
-  private String serverInstanceId_;
-  
-  /**
-   * @return Returns the runtimeId_.
-   */
-  public String getRuntimeId()
-  {
-    return runtimeId_;
-  }
-  /**
-   * @param runtimeId_ The runtimeId_ to set.
-   */
-  public void setRuntimeId(String runtimeId_)
-  {
-    this.runtimeId_ = runtimeId_;
-  }
-  /**
-   * @return Returns the serverId_.
-   */
-  public String getServerId()
-  {
-    return serverId_;
-  }
-  /**
-   * @param serverId_ The serverId_ to set.
-   */
-  public void setServerId(String serverId_)
-  {
-    this.serverId_ = serverId_;
-  }
-  /**
-   * @return Returns the serverInstanceId_.
-   */
-  public String getServerInstanceId()
-  {
-    return serverInstanceId_;
-  }
-  /**
-   * @param serverInstanceId_ The serverInstanceId_ to set.
-   */
-  public void setServerInstanceId(String serverInstanceId_)
-  {
-    this.serverInstanceId_ = serverInstanceId_;
-  }
-  /**
-   * @return Returns the typeId_.
-   */
-  public String getTypeId()
-  {
-    return typeId_;
-  }
-  /**
-   * @param typeId_ The typeId_ to set.
-   */
-  public void setTypeId(String typeId_)
-  {
-    this.typeId_ = typeId_;
-  }
-  
-  /* (non-Javadoc)
-   * @see java.lang.Object#toString()
-   */
-  public String toString()
-  {
-    return "type(" + typeId_ + ") runtime(" + runtimeId_ + ") factory(" + serverId_ + ") servInstId(" + serverInstanceId_ + ")";
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/dialog/IStatusDialogConstants.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/dialog/IStatusDialogConstants.java
deleted file mode 100644
index 687bfeb..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/dialog/IStatusDialogConstants.java
+++ /dev/null
@@ -1,57 +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.dialog;
-
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-
-/**
-* Constants for status dialogs
-*/
-public interface IStatusDialogConstants {
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2002.";
-
-  /*
-  * 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 = WebServicePlugin.getMessage("%STATUS_DIALOG_YES_LABEL");
-  /*
-  * Button label for the "Yes to all" button
-  */
-  public static final String YES_TO_ALL_LABEL = WebServicePlugin.getMessage("%STATUS_DIALOG_YES_TO_ALL_LABEL");
-  /*
-  * Button label for the "Cancel" button
-  */
-  public static final String CANCEL_LABEL = WebServicePlugin.getMessage("%STATUS_DIALOG_CANCEL_LABEL");
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExecutable.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExecutable.java
deleted file mode 100644
index 37326bf..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExecutable.java
+++ /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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.ext;
-
-/**
-* All Extensions with exectutable extensions should implement this 
-* to fit our framework
-*/
-public interface WebServiceExecutable
-{
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-  /**
-  *Returns a wizard fragment for this exention type 
-  *
-  */
-  public WebServiceFinishCommand getFinishCommand();
-}
-
-
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtension.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtension.java
deleted file mode 100644
index 6bbc476..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtension.java
+++ /dev/null
@@ -1,46 +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.ext;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-
-
-/**
-* This represents an extension in the plugin registry 
-* It job is to act as a proxy to the iconfigelement
-*/
-public interface WebServiceExtension
-{
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  /**
-  * If the extension has code that needs to be executed or a fragment added
-  * @return WebServiceExecutable this interface holds executable code and a 
-  * fragment
-  */
-  public WebServiceExecutable getWebServiceExecutableExtension();
-
-  /**
-  * This is the config element that holds the extension info
-  * @param IConfigurationElement Extension element
-  */
-  public void setConfigElement(IConfigurationElement configElement);
- 
-  /**
-  * If the extension has code that 
-  * @return IConfigurationElement Extension element
-  */
-  public IConfigurationElement getConfigElement();
-}
-
-
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtensionImpl.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtensionImpl.java
deleted file mode 100644
index 779e905..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtensionImpl.java
+++ /dev/null
@@ -1,105 +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.ext;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.wst.command.env.core.common.Log;
-import org.eclipse.wst.command.env.eclipse.EclipseLog;
-
-
-
-
-
-/**
-* This represents an extension in the plugin registry 
-* It job is to act as a proxy to the iconfigelement
-*/
-public class WebServiceExtensionImpl implements WebServiceExtension
-{
-
-	private Log	log_;
-	
-  /*
-  * The ConfigElement that holds extension info
-  */
-  protected IConfigurationElement configElement_;
-
-  /*
-  * The extension executable 
-  */
-  protected WebServiceExecutable webServiceExecutable_;
-  
-
-  public WebServiceExtensionImpl(IConfigurationElement configElement)
-  {
-    configElement_ = configElement;
-    log_ = new EclipseLog();
-  }
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  /**
-  * If the extension has code that needs to be executed or a fragment added
-  * @return WebServiceExecutable this interface holds executable code and a 
-  * fragment
-  */
-  public WebServiceExecutable getWebServiceExecutableExtension()
-  {
-    if(webServiceExecutable_ != null) return webServiceExecutable_;
-
-    try{
-      Object webServiceExecutable = configElement_.createExecutableExtension("class");
-      
-      if( webServiceExecutable instanceof WebServiceExecutable)
-        return (WebServiceExecutable)webServiceExecutable; 
-      else
-      	log_.log(Log.ERROR, 5028, this, "getWebServiceExecutableExtension", "Incorrect WebServiceTest:" + webServiceExecutable.getClass().getName());      
-    }catch (CoreException e){
-      log_.log(Log.ERROR, 5029, this, "getWebServiceExecutableExtension",e);
-    }
-
-    return null;
-  }
-
-  /**
-  * This is the config element that holds the extension info
-  * @param IConfigurationElement Extension element
-  */
-  public void setConfigElement(IConfigurationElement configElement)
-  {
-    configElement_ = configElement;
-  }	
-
-  /**
-  * This is the config element that holds the extension info
-  * @return IConfigurationElement Extension element
-  */
-  public IConfigurationElement getConfigElement()
-  {
-    return configElement_;
-  }
-  
-  /**
-  * The name of the extension being used
-  * @return String name of this extension
-  */
-  public String getName()
-  {
-    return getConfigElement().getAttribute( "name" );
-  }
-
-
-}
-
-
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtensionRegistry.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtensionRegistry.java
deleted file mode 100644
index afc1d07..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtensionRegistry.java
+++ /dev/null
@@ -1,42 +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.ext;
-
-
-/**
-* Returns the names of the extensions for a given extension-point 
-* also returns the extension objects 
-*
-*/
-public interface WebServiceExtensionRegistry
-{
-  
-  /**
-  * Returns the names of all registered extensions
-  * @return The names of all registered extensions.
-  */
-  public String[] getWebServiceExtensionNames ();
-  
-  /**
-  * Returns the extension object of the given name
-  *@return WebServiceExtension object
-  */
-  public WebServiceExtension getWebServiceExtensionsByName( String name);
-
-  /**
-  * Returns All extention objects in this registry
-  *@return WebServiceExtension objects
-  */
-  public WebServiceExtension[] getWebServiceExtensions();
-  
-  
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtensionRegistryImpl.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtensionRegistryImpl.java
deleted file mode 100644
index 7f5cefb..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtensionRegistryImpl.java
+++ /dev/null
@@ -1,116 +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.ext;
-
-import java.util.Hashtable;
-import java.util.Vector;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jst.ws.internal.data.LabelsAndIds;
-
-
-/**
-* This is a generic registry which sets up general code in handling   
-* IConfigElements for an extension
-*/
-public abstract class WebServiceExtensionRegistryImpl implements WebServiceExtensionRegistry
-{
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-  
-  private Hashtable nameExtensionTable_;
-  private Vector id_;
-  private Vector label_;
-  private LabelsAndIds labelsandids_;
-    
-  public WebServiceExtensionRegistryImpl()
-  {
-    nameExtensionTable_ = new Hashtable();
-    label_ = new Vector();
-    id_ = new Vector();
-    loadExtensions();
-  }
-  
-  /**
-  * Children registries will have different extension types 
-  * @return WebserviceExtension holds a config elem
-  * for that extension capable of creating an executable file
-  */
-  public abstract WebServiceExtension createWebServiceExtension(IConfigurationElement configElement);
-
-  /**
-  * Children must implement how they get the IConfigurationElement[] 
-  * @return IConfigurationElement[] an array of elements particular to that
-  * extension
-  */
-  public abstract IConfigurationElement[] getConfigElements();
-
-  /*
-  * Loads WebServiceExtensions for WebServiceClientTest into this registry.
-  * This is done by querying the plugin registry for all extensions
-  * that extend webServiceClientTest  
-  */
-  private void loadExtensions ()
-  {    
-    IConfigurationElement[] config = getConfigElements();
-
-    for(int idx=0; idx<config.length; idx++) 
-    {
-      IConfigurationElement elem = config[idx];
-      String name = elem.getAttribute( "name" );
-      String id =   elem.getAttribute( "id" );      
-      WebServiceExtension webServiceExtension = createWebServiceExtension(elem);	
-      nameExtensionTable_.put(name,webServiceExtension);
-      label_.add(name);
-      id_.add(id);
-    }
-  }
-
-  /**
-  * Returns the names of all registered extensions
-  * @return The names of all registered extensions.
-  */
-  public String[] getWebServiceExtensionNames ()
-  {
-    return (String[])nameExtensionTable_.keySet().toArray( new String[0] );
-  }
-
-  /**
-   * Return the names and Ids 
-   */
-  public LabelsAndIds getLabelsAndIDs()
-  {
-  	labelsandids_ = new LabelsAndIds();
-  	labelsandids_.setLabels_((String[])label_.toArray( new String[0] ));
-  	labelsandids_.setIds_((String[])id_.toArray( new String[0] ));
-  	return labelsandids_;
-  }
-  
-  /**
-  * Returns the extension object of the given name
-  * @return WebServiceExtension object
-  */
-  public WebServiceExtension getWebServiceExtensionsByName( String name)
-  {
-    return (WebServiceExtension)nameExtensionTable_.get(name);
-  }
-
-  /**
-  * Returns All extention objects in this registry
-  *@return WebServiceExtension objects
-  */
-  public WebServiceExtension[] getWebServiceExtensions()
-  {
-    return (WebServiceExtension[])nameExtensionTable_.values().toArray( new WebServiceExtension[0] );
-  }
-  
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceFinishCommand.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceFinishCommand.java
deleted file mode 100644
index 96a29bb..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceFinishCommand.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
-* <copyright>
-*
-* Licensed Material - Property of IBM
-* (C) Copyright IBM Corp. 2000, 2002 - All Rights Reserved.
-* US Government Users Restricted Rights - Use, duplication or disclosure
-* restricted by GSA ADP Schedule Contract with IBM Corp.
-*
-* </copyright>
-*/
-
-package org.eclipse.jst.ws.internal.ext;
-
-import org.eclipse.wst.command.env.core.Command;
-
-public interface WebServiceFinishCommand extends Command
-{
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/JavaProxyTestCommand.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/JavaProxyTestCommand.java
deleted file mode 100644
index c503972..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/JavaProxyTestCommand.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
-* <copyright>
-*
-* Licensed Material - Property of IBM
-* (C) Copyright IBM Corp. 2000, 2002 - All Rights Reserved.
-* US Government Users Restricted Rights - Use, duplication or disclosure
-* restricted by GSA ADP Schedule Contract with IBM Corp.
-*
-* </copyright>
-*/
-
-package org.eclipse.jst.ws.internal.ext.test;
-
-import org.eclipse.wst.command.env.core.selection.BooleanSelection;
-
-public interface JavaProxyTestCommand extends WebServiceTestFinishCommand
-{
-
- /**
-  * This holds an info class that comes from user input or some calcilations that needs to be
-  * used for the finish
-  */
-  
-  public void setJspFolder(String jspFolder);
-  
-  public void setRunClientTest(boolean runClientTest);
-  
-  public void setSampleProject(String sampleProject);
-  
-  public void setProxyBean(String proxyBean);
-  
-  public void setSetEndpointMethod(String setEndpointMethod);
-  
-  public void setClientProject(String clientProject);
-  
-  public void setMethods(BooleanSelection[] methods);
-  
-  
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/WSDLTestFinishCommand.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/WSDLTestFinishCommand.java
deleted file mode 100644
index 2523dcf..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/WSDLTestFinishCommand.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
-* <copyright>
-*
-* Licensed Material - Property of IBM
-* (C) Copyright IBM Corp. 2000, 2002 - All Rights Reserved.
-* US Government Users Restricted Rights - Use, duplication or disclosure
-* restricted by GSA ADP Schedule Contract with IBM Corp.
-*
-* </copyright>
-*/
-
-package org.eclipse.jst.ws.internal.ext.test;
-
-public interface WSDLTestFinishCommand extends WebServiceTestFinishCommand
-{
-  public void setServiceProject(String serverProject);
-  public void setWsdlServiceURL(String wsdlURI);
-  public void setExternalBrowser(boolean external); 
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/WebServiceTestExtension.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/WebServiceTestExtension.java
deleted file mode 100644
index 811ab23..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/WebServiceTestExtension.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.ext.test;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jst.ws.internal.ext.WebServiceExtensionImpl;
-
-
-
-/**
-* This represents an extension in the plugin registry 
-* It job is to act as a proxy to the iconfigelement
-* In particular it holds a client test extension element 
-*/
-public class WebServiceTestExtension extends WebServiceExtensionImpl
-{
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  public WebServiceTestExtension(IConfigurationElement configElement)
-  {
-    super(configElement);
-  }
-  
-  /**
-  * Will this testClient generate code
-  * @return boolean true if codegen needed
-  */
-  public boolean isCodeGenNeeded()
-  {
-    return Boolean.valueOf(getConfigElement().getAttribute( "codegen" )).booleanValue();
-  }
-  
-  /**
-  * Use the default Folder Provided by us
-  * @return boolean true if no special folder requires
-  */
-  public boolean useDefaultCodeGenFolder()
-  {
-    return Boolean.valueOf(getConfigElement().getAttribute( "defaultcodegenfolder" )).booleanValue();
-  }
-
-  /**
-  * Use Special Folder for generated code
-  * @return String special folder name
-  */
-  public String getCodeGenFolder()
-  {
-    return getConfigElement().getAttribute( "codegenfolder" );
-  }
-
-  /**
-  * Do we need to launch something
-  * @return Boolean if true launch codegen
-  */
-  public boolean isLaunchRequired()
-  {
-    return Boolean.valueOf(getConfigElement().getAttribute( "launchRequired" )).booleanValue();
-  }
-
-  /**
-  * Do we need the methods for the proxy
-  * @return boolean true if proxy methods needed
-  */
-  public boolean areMethodsNeeded()
-  {
-    return Boolean.valueOf(getConfigElement().getAttribute( "methodsneeded" )).booleanValue();
-  }
-
-  /**
-  * Does this test machine need a server
-  * @return boolean true if a server is required
-  */
-  public boolean isServerNeeded()
-  {
-    return Boolean.valueOf(getConfigElement().getAttribute( "serverneeded" )).booleanValue();
-  }
-
-  /**
-  * Use the Default Server chosen by the wizard
-  * @return boolean true if the default server is wanted
-  */
-  public boolean useDefaultServer()
-  {
-    return Boolean.valueOf(getConfigElement().getAttribute( "defaultserver" )).booleanValue();
-  }
-
-  /**
-  * Use the Default Server chosen by the wizard
-  * @return boolean true if the default server is wanted
-  */
-  public String useServer()
-  {
-    return getConfigElement().getAttribute( "useserver" );
-  }
-
-  public boolean isJava()
-  {
-  	return Boolean.valueOf(getConfigElement().getAttribute( "java" )).booleanValue();
-  }
-  	
-  
-}
-
-
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/WebServiceTestFinishCommand.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/WebServiceTestFinishCommand.java
deleted file mode 100644
index 0e87ff5..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/WebServiceTestFinishCommand.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
-* <copyright>
-*
-* Licensed Material - Property of IBM
-* (C) Copyright IBM Corp. 2000, 2002 - All Rights Reserved.
-* US Government Users Restricted Rights - Use, duplication or disclosure
-* restricted by GSA ADP Schedule Contract with IBM Corp.
-*
-* </copyright>
-*/
-
-package org.eclipse.jst.ws.internal.ext.test;
-
-import java.util.List;
-
-import org.eclipse.jst.ws.internal.ext.WebServiceFinishCommand;
-import org.eclipse.wst.server.core.IServer;
-
-public interface WebServiceTestFinishCommand extends WebServiceFinishCommand
-{
-
-  /**
-   * If the command needs a server this is the chosen 
-   * client serverID
-   * @param sampleServerTypeID
-   */
-  public void setServerTypeID(String serviceServerTypeID);
-  
-  /**
-   * This is the IServer if required
-   * @param sampleExistingServer
-   */
-  public void setExistingServer(IServer serviceExistingServer);
-  
-  /**
-   * This is the endpoints if monitor service is enabled
-   * @param endpoints
-   */
-  public void setEndpoint(List endpoints);
-  
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/WebServiceTestRegistry.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/WebServiceTestRegistry.java
deleted file mode 100644
index 2d06466..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/WebServiceTestRegistry.java
+++ /dev/null
@@ -1,71 +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.ext.test;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jst.ws.internal.ext.WebServiceExtension;
-import org.eclipse.jst.ws.internal.ext.WebServiceExtensionRegistryImpl;
-
-public class WebServiceTestRegistry extends WebServiceExtensionRegistryImpl
-{
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-  /*
-   * This is a singleton becasue it was decided that the memory foot print 
-   * is not as expensive as the time taken retrieving the data
-   * 
-   */
-  
-  
-  private static WebServiceTestRegistry wstr;
-  
-  public static WebServiceTestRegistry getInstance()
-  {
-  	if(wstr == null) wstr = new WebServiceTestRegistry();
-    return wstr;
-  }
-  
-  private WebServiceTestRegistry()
-  {
-    super();
-  }
-  
-  /**
-  * Children registries will have different extension types 
-  * @return WebserviceExtension holds a config elem
-  * for that extension capable of creating an executable file
-  */
-  public WebServiceExtension createWebServiceExtension(IConfigurationElement configElement)
-  {
-    return new WebServiceTestExtension(configElement);
-  }
-
-  /**
-  * Children must implement how they get the IConfigurationElement[] 
-  * @return IConfigurationElement[] an array of elements particular to that
-  * extension
-  */
-  public IConfigurationElement[] getConfigElements()
-  {
-    IExtensionRegistry reg = Platform.getExtensionRegistry();
-    IConfigurationElement[] config = reg.getConfigurationElementsFor(
-                                     "org.eclipse.jst.ws.consumption.ui",
-                                     "webServiceTest");
-    return config;    
-  }
-
-
-    
-  
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/plugin/WebServicePlugin.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/plugin/WebServicePlugin.java
deleted file mode 100644
index 53b63f7..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/plugin/WebServicePlugin.java
+++ /dev/null
@@ -1,132 +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.plugin;
-
-import java.text.MessageFormat;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.jst.ws.internal.context.PersistentProjectTopologyContext;
-import org.eclipse.jst.ws.internal.context.PersistentScenarioContext;
-import org.eclipse.jst.ws.internal.context.PersistentUDDIPreferenceContext;
-import org.eclipse.jst.ws.internal.context.ProjectTopologyContext;
-import org.eclipse.jst.ws.internal.context.ScenarioContext;
-import org.eclipse.jst.ws.internal.context.UDDIPreferenceContext;
-import org.eclipse.wst.command.env.core.context.ResourceContext;
-import org.eclipse.wst.command.internal.env.context.PersistentResourceContext;
-
-
-/**
-* This is the plugin class for the Web Services plugin.
-* <p>
-* This plugin contains the bulk of the Web Services runtime.
-* Only the graphical user interface portion of the runtime is
-* found elsewhere - in the org.eclipse.jst.ws.ui plugin.
-*/
-public class WebServicePlugin extends Plugin
-{
-  /**
-  * The identifier of the descriptor of this plugin in plugin.xml.
-  */
-  public static final String ID = "org.eclipse.jst.ws";
-
-  /**
-  * The reference to the singleton instance of this plugin.
-  */
-  private static WebServicePlugin instance_;
-
-  private PersistentResourceContext resourceContext_;
-  private PersistentScenarioContext scenarioContext_;
-  private PersistentProjectTopologyContext projectTopologyContext_;
-  private PersistentUDDIPreferenceContext uddiPreferenceContext;
-  
-  /**
-   * Constructs a runtime plugin object for this plugin.
-   */
-  public WebServicePlugin()
-  {
-    super();
-    instance_ = this; 
-  }
-  
-  /**
-  * Returns the singleton instance of this plugin.
-  * @return The WebServicePlugin singleton.
-  */
-  public static WebServicePlugin getInstance ()
-  {
-    return instance_;
-  }
-
-  protected void initializeDefaultPluginPreferences() 
-  {
-  		((PersistentProjectTopologyContext) getProjectTopologyContext()).load();
-  		((PersistentUDDIPreferenceContext) getUDDIPreferenceContext()).load();
-  }
-
-  public ResourceContext getResourceContext()
-  {
-  		if (resourceContext_ == null) 
-  			resourceContext_ = PersistentResourceContext.getInstance();
-		return resourceContext_;
-  }
-
-  public ScenarioContext getScenarioContext()
-  {
-  		if (scenarioContext_ == null)
-  		{
-  		  scenarioContext_ = new PersistentScenarioContext();
-  		  scenarioContext_.load();
-  		}
-
-		return scenarioContext_;
-  }
-
-  public ProjectTopologyContext getProjectTopologyContext()
-  {
-    if (projectTopologyContext_ == null)
-      projectTopologyContext_ = new PersistentProjectTopologyContext();
-    return projectTopologyContext_;
-  }
-
-  
-  public UDDIPreferenceContext getUDDIPreferenceContext()
-  {
-    if (uddiPreferenceContext == null)
-      uddiPreferenceContext = new PersistentUDDIPreferenceContext();
-    return uddiPreferenceContext;
-  }
-    
-  /**
-  * 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/src/org/eclipse/jst/ws/plugin.properties b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/plugin.properties
deleted file mode 100644
index 29bdaaf..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/plugin.properties
+++ /dev/null
@@ -1,16 +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.
-#
-
-MSG_ERROR_SERVER=IWAB0213E Error in starting server.
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 065ac06..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.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<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 d8590af..0000000
--- a/bundles/org.eclipse.wst.command.env.core/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-build.xml
-runtime
-temp.folder
-envcore.jar
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/build.properties b/bundles/org.eclipse.wst.command.env.core/build.properties
deleted file mode 100644
index 6883bc7..0000000
--- a/bundles/org.eclipse.wst.command.env.core/build.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-bin.includes = plugin.xml,\
-               *.jar,\
-               envcore.jar
-src.includes = .classpath,\
-               .project,\
-               build.properties,\
-               plugin.xml,\
-               src/
-source.envcore.jar = src/
-output.envcore.jar = bin/
-jars.compile.order = envcore.jar
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 0b07fb0..0000000
--- a/bundles/org.eclipse.wst.command.env.core/plugin.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin
-   id = "org.eclipse.wst.command.env.core"
-   version = "1.0.0"
-   name = "%PLUGIN_NAME"
-   provider-name = "%PLUGIN_PROVIDER">
-
-   <runtime>
-      <library name="envcore.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-
-</plugin>
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/Command.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/Command.java
deleted file mode 100644
index 6fbda35..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/Command.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.command.env.core;
-
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.Status;
-
-/**
- * Commands are executable, undoable, redoable objects.
- * Every Command has a name and a description.
- */
-public interface Command
-{
-  /**
-   * Returns the name of the Command, a short translatable string
-   * indicating what the Command does. Can be null.
-   * @return The name of the Command. Can be null.
-   */
-  public String getName ();
-
-  /**
-   * Returns the description of the Command. Can be null.
-   * @return The description of the Command. Can be null.
-   */
-  public String getDescription ();
-  
-  /**
-   * Executes the Command.
-   * @param environment The environment.
-   * Must not be null.
-   * @return A <code>Status</code> object indicating the degree
-   * to which the <code>execute</code> method was successful.
-   * A valud of <code>null</code>, or a Status with a severity
-   * of less than <code>Status.ERROR</code> signifies success.
-   */
-  public Status execute ( Environment environment );
-
-  /**
-   * Returns <code>true</code> if, and only if, the Command's
-   * <code>undo</code> method is supported.
-   * @return True if the Command supports being undone.
-   */
-  public boolean isUndoable ();
-
-  /**
-   * Undoes the Command.
-   * @param environment The environment.
-   * Must not be null.
-   * @return A <code>Status</code> object indicating the degree
-   * to which the <code>undo</code> method was successful.
-   * A valud of <code>null</code>, or a Status with a severity
-   * of less than <code>Status.ERROR</code> signifies success.
-   */
-  public Status undo ( Environment environment );
-
-  /**
-   * Returns <code>true</code> if, and only if, the Command's
-   * <code>redo</code> method is supported.
-   * @return True if the Command supports being redone.
-   */
-  public boolean isRedoable ();
-
-  /**
-   * Re-executes the Command.
-   * @param environment The environment.
-   * Must not be null.
-   * @return A <code>Status</code> object indicating the degree
-   * to which the <code>redo</code> method was successful.
-   * A value of <code>null</code>, or a Status with a severity
-   * of less then <code>Status.ERROR</code> signifies success.
-   */
-  public Status redo ( Environment environment );
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/CommandFactory.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/CommandFactory.java
deleted file mode 100644
index 9f8df61..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/CommandFactory.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.env.core;
-
-/**
- * This interface is used to create Command objects.
- *
- */
-public interface CommandFactory 
-{
-  /**
-   * 
-   * @return returns a created Command object.
-   */
-  public Command create();
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/CommandManager.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/CommandManager.java
deleted file mode 100644
index 66b479e..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/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.env.core;
-
-import org.eclipse.wst.command.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/env/core/MultiCommand.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/MultiCommand.java
deleted file mode 100644
index 5dab5fe..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/MultiCommand.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.env.core;
-
-import java.util.Arrays;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.ListIterator;
-
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.Status;
-
-
-/**
- * This command can be used to group multiple Commands together
- * into a single sequence list of commands to execute.
- *
- *
- */
-public class MultiCommand extends SimpleCommand
-{
-	  
-  protected String name        = null;
-  protected String description = null;
-
-  private List            commands_      = new LinkedList();
-  private Command[]       commandsArray_ = null;
-
-  /**
-   * Creates a MultiCommand with no name, description, or list of commands.
-   *
-   */
-  public MultiCommand ()
-  {
-  }
-
-  /**
-   * Creates a MutilCommands with an empty list of commands.
-   * @param name The name of the command.
-   * @param description A description of the command.
-   */
-  public MultiCommand ( String name, String description )
-  {
-    this.name = name;
-    this.description = description;
-  }
-
-  /**
-   * Creates a MultiCommand
-   * @param name the name of the command.
-   * @param description a description of the command.
-   * @param commands an initial list of the commands to execute.
-   */
-  public MultiCommand ( String name, String description, Command[] commands )
-  {
-    this.name = name;
-    this.description = description;
-    commands_.addAll(Arrays.asList(commands));
-  }
-
-  /**
-   * Adds a command to the list of commands to execute.
-   * @param command the command to add.
-   */
-  public void add ( Command command )
-  {
-    commandsArray_ = null;
-    commands_.add(command);
-  }
-
-  /**
-   *  
-   * @see org.eclipse.wst.command.env.core.Command#getName()
-   */
-  public String getName ()
-  {
-    return name != null ? name : (commands_.size() > 0 ? ((Command)commands_.get(0)).getName() : null);
-  }
-
-  /**
-   * 
-   * @see org.eclipse.wst.command.env.core.Command#getDescription()
-   */
-  public String getDescription ()
-  {
-    return description != null ? description : (commands_.size() > 0 ? ((Command)commands_.get(0)).getDescription() : null);
-  }
-
-  /**
-   * Executes the list of commands in the MultiCommand.
-   */
-  public Status execute ( Environment environment )
-  {
-    Status status = null;
-    Command[] commands = commandsArray();
-    for (int i=0; i<commands.length; i++)
-    {
-      status = commands[i].execute(environment);
-      
-      if (status != null && status.matches(Status.ERROR))
-      {
-        for (i--; i>=0; i--)
-        {
-          commands[i].undo(environment);
-        }
-        return status;
-      }
-    }
-    return status;
-  }
-
-  /**
-   * Indicates if this command is undoable.  If one of the commands
-   * in the list is undoable the entire list is considered to be 
-   * undoable.
-   */
-  public boolean isUndoable ()
-  {
-    ListIterator i = commands_.listIterator();
-    while (i.hasPrevious())
-    {
-      if (!((Command)i.previous()).isUndoable())
-      {
-        return false;
-      }
-    }
-    return true;
-  }
-
-  /**
-   * Undos this command if it can.
-   */
-  public Status undo ( Environment environment )
-  {
-    Status status = null;
-    ListIterator i = commands_.listIterator();
-    while (i.hasPrevious())
-    {
-      status = ((Command)i.previous()).undo(environment);
-    }
-    return status;
-  }
-
-  /**
-   * Returns whether this command is redoable or not.
-   */
-  public boolean isRedoable ()
-  {
-    ListIterator i = commands_.listIterator();
-    while (i.hasNext())
-    {
-      if (!((Command)i.next()).isRedoable())
-      {
-        return false;
-      }
-    }
-    return true;
-  }
-
-  /**
-   * Reexecutes this command.
-   */
-  public Status redo ( Environment environment )
-  {
-    Status status = null;
-    Command[] commands = commandsArray();
-    for (int i=0; i<commands.length; i++)
-    {
-      status = commands[i].redo(environment);
-      if (status != null && status.matches(Status.ERROR))
-      {
-        for (i--; i>=0; i--)
-        {
-          commands[i].undo(environment);
-        }
-        return status;
-      }
-    }
-    return status;
-  }
-  
-  private Command[] commandsArray ()
-  {
-    if (commandsArray_ == null)
-    {
-      commandsArray_ = (Command[])commands_.toArray(new Command[0]);
-    }
-    return commandsArray_;
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/SimpleCommand.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/SimpleCommand.java
deleted file mode 100644
index 5f30ca7..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/SimpleCommand.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.env.core;
-
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-
-/**
- * This is a simple implementation of the Command interface that subclass
- * can extend.
- *
- */
-public class SimpleCommand implements Command
-{
-  private String name_;
-  private String description_;
-  
-  public SimpleCommand( String name, String description )
-  {
-    name_        = name;
-    description_ = description;
-  }
-  
-  public SimpleCommand()
-  {  
-    name_        = "";
-    description_ = "";
-  }
-    
-  /**
-   * Sets the name of the command.
-   * @param name the name.
-   */
-  public void setName( String name )
-  {
-    name_ = name;  
-  }
-  
-  /**
-   * Sets the description of the command.
-   * @param description the description.
-   */
-  public void setDescription( String description )
-  {
-    description_ = description;
-  }
-  
-  /**
-   * @see org.eclipse.env.command.Command#execute(org.eclipse.env.common.Environment)
-   */
-  public Status execute(Environment environment)
-  {
-    return new SimpleStatus( "" );
-  }
-  
-  /**
-   * @see org.eclipse.env.command.Command#getDescription()
-   */
-  public String getDescription()
-  {
-    return description_;
-  }
-
-  /**)
-   * @see org.eclipse.env.command.Command#getName()
-   */
-  public String getName()
-  {
-    return name_;
-  }
-  
-  /**)
-   * @see org.eclipse.env.command.Command#isRedoable()
-   */
-  public boolean isRedoable()
-  {
-    return false;
-  }
-
-  /**
-   * @see org.eclipse.env.command.Command#isUndoable()
-   */
-  public boolean isUndoable()
-  {
-    return false;
-  }
-
-  /**
-   * @see org.eclipse.env.command.Command#redo(org.eclipse.env.common.Environment)
-   */
-  public Status redo(Environment environment)
-  {
-    return new SimpleStatus( "" );
-  }
-
-  /**
-   * @see org.eclipse.env.command.Command#undo(org.eclipse.env.common.Environment)
-   */
-  public Status undo(Environment environment)
-  {
-    return new SimpleStatus( "" );
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/common/Choice.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/common/Choice.java
deleted file mode 100644
index 23cc9b9..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/common/Choice.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.command.env.core.common;
-
-public class Choice {
-
-  	protected char shortcut = ' '; 
-	protected String label = null;
-  	protected String description = null;
-  	
-	/**
-	 * Constructor for Choice.
-	 */
-	public Choice() {
-	}
-
-	/**
-	 * Constructor for Choice.
-	 * @param shortcut
-	 * @param label
-	 */
-	public Choice(char shortcut, String label) {
-		this.shortcut = shortcut;
-		this.label = label;
-	}
-	
-	/**
-	 * Constructor for Choice.
-	 * @param shortcut
-	 * @param label
-	 * @param description
-	 */
-	public Choice(char shortcut, String label, String description) {
-		this.shortcut = shortcut;
-		this.label = label;
-		this.description = description;
-	}
-
-	/**
-	 * Gets the label.
-	 * @return Returns a String
-	 */
-	public String getLabel() {
-		return label;
-	}
-
-	/**
-	 * Sets the label.
-	 * @param label The label to set
-	 */
-	public void setLabel(String label) {
-		this.label = label;
-	}
-
-	/**
-	 * Gets the description.
-	 * @return Returns a String
-	 */
-	public String getDescription() {
-		return description;
-	}
-
-	/**
-	 * Sets the description.
-	 * @param description The description to set
-	 */
-	public void setDescription(String description) {
-		this.description = description;
-	}
-
-	/**
-	 * Gets the shortcut.
-	 * @return Returns a char
-	 */
-	public char getShortcut() {
-		return shortcut;
-	}
-
-	/**
-	 * Sets the shortcut.
-	 * @param shortcut The shortcut to set
-	 */
-	public void setShortcut(char shortcut) {
-		this.shortcut = shortcut;
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/common/Condition.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/common/Condition.java
deleted file mode 100644
index 9a2fea1..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/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.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/env/core/common/Environment.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/common/Environment.java
deleted file mode 100644
index 9bd4233..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/common/Environment.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 Eclipse Public License v1.0
- * which accompanies this 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.env.core.common;
-
-import org.eclipse.wst.command.env.core.CommandManager;
-import org.eclipse.wst.command.env.core.uri.URIFactory;
-
-
-/**
- * An Environment provides the means for a 
- * <ol>
- * <li>A log for writing messages to a logging facility,</li>
- * <li>A progress monitor for receiving progress information,</li>
- * <li>A status handler for receiving and processing status reports,</li>
- * <li>A factory for the handling of URIs (resources).</li>
- * </ol>
- */
-public interface Environment
-{
-  /**
-   * Returns a logging facility.
-   */
-  public Log getLog ();
-
-  /**
-   * Returns a progress monitor.
-   */
-  public ProgressMonitor getProgressMonitor ();
-
-  /**
-   * Returns a status handler.
-   */
-  public StatusHandler getStatusHandler ();
-
-  /**
-   * Returns a URI factory.
-   * Hint: Implementers should insure that the Factory they return
-   * has a reference to this Environment so that URI objects can
-   * report progress and announce status.
-   */
-  public URIFactory getURIFactory ();
-
-  /**
-   * Returns a compiler appropriate to the environment.
-   */
-  public JavaCompiler getJavaCompiler ();
-
-  /**
-   * Returns an object that helps manage execution/undoing of Commands.
-   */
-  public CommandManager getCommandManager ();
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/common/EnvironmentException.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/common/EnvironmentException.java
deleted file mode 100644
index b315b61..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/common/EnvironmentException.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.wst.command.env.core.common;
-
-/**
- * This is the exception class for conditions raised by the Environment.
- */
-public class EnvironmentException extends Exception
-{
-  /**
-   * Comment for <code>serialVersionUID</code>
-   */
-  private static final long serialVersionUID = 3978983275899402036L;
-  
-  protected Status status = null;
-  
-  /**
-   * Creates a new EnvironmentException.
-   */
-  public EnvironmentException ()
-  {
-    super();
-  }
-
-  /**
-   * Creates a new EnvironmentException.
-   */
-  public EnvironmentException ( Status status )
-  {
-    super(status == null ? null : status.getMessage());
-    this.status = status;
-  }
-
-  /**
-   * Returns the Status object.
-   */
-  public Status getStatus()
-  {
-    return status;
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/common/Evaluate.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/common/Evaluate.java
deleted file mode 100644
index a78591f..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/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.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/env/core/common/JavaCompiler.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/common/JavaCompiler.java
deleted file mode 100644
index 7710d60..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/common/JavaCompiler.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.env.core.common;
-
-import org.eclipse.wst.command.env.core.uri.URI;
-
-/**
- * This is the interface for an object that does Java compilation
- * of a resource.
- */
-public interface JavaCompiler
-{
-  /**
-   * Compiles the given Java file to the given class file,
-   * using context information on classpaths, options, etc.
-   */
-  public void compile ( URI javaUri, URI classUri, JavaCompilerContext context );
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/common/JavaCompilerContext.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/common/JavaCompilerContext.java
deleted file mode 100644
index cbc9758..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/common/JavaCompilerContext.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.env.core.common;
-
-/**
- * This is the interface for an object that contains data
- * required by JavaCompiler.compile().
- */
-public interface JavaCompilerContext
-{
-  // TBD...
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/common/Log.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/common/Log.java
deleted file mode 100644
index a018c80..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/common/Log.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.command.env.core.common;
-
-/**
- * Log objects provide a means for logging information for FFDC etc.
- */
-public interface Log
-{
-  public static final int OK = 0;
-  public static final int INFO = 1;
-  public static final int WARNING = 2;
-  public static final int ERROR = 4;
-
-  /**
-   * Returns true if logging is enabled.
-   * There is no requirement to call this method before attempting
-   * a call to one of the <code>log</code> methods, as they will
-   * quietly do nothing if logging is disabled. This method can be
-   * useful, however, anywhere the cost of building up the parameters
-   * to a log method might be high and best avoided except when logging
-   * is enabled.
-   * @return True if logging is enabled, and false otherwise.
-   */
-  public boolean isEnabled ();
-  
-  /**
-   * Returns true if the the debug option is set to true.
-   */
-  public boolean isEnabled (String option);
-
-  /**
-   * Logs a <code>Throwable</code>.
-   * @param severity The severity of the logging entry.
-   * @param messageNum  The message number.
-   * @param caller The object (for non-static methods) or class (for
-   * static methods) doing the logging.
-   * @param method The simple name of the method doing the loging.
-   * @param throwable The Throwable to log.
-   */
-  public void log ( int severity, int messageNum, Object caller, String method, Throwable throwable );
-  
-  /**
-   * Logs a <code>Throwable</code>.
-   * @param severity The severity of the logging entry.
-   * @param debug option
-   * @param messageNum The message number.
-   * @param caller The object (for non-static methods) or class (for
-   * static methods) doing the logging.
-   * @param method The simple name of the method doing the loging.
-   * @param throwable The Throwable to log.
-   */
-  public void log ( int severity, String option, int messageNum, Object caller, String method, Throwable throwable );
-
-  /**
-   * Logs a <code>Status</code>.
-   * @param severity The severity of the logging entry.
-   * @param messageNum  The message number.
-   * @param caller The object (for non-static methods) or class (for
-   * static methods) doing the logging.
-   * @param method The simple name of the method doing the loging.
-   * @param status The Status to log.
-   */
-  public void log ( int severity, int messageNum, Object caller, String method, Status status );
-  
-  /**
-   * Logs a <code>Status</code>.
-   * @param severity The severity of the logging entry.
-   * @param debug option
-   * @param messageNum  The message number.
-   * @param caller The object (for non-static methods) or class (for
-   * static methods) doing the logging.
-   * @param method The simple name of the method doing the loging.
-   * @param status The Status to log.
-   */
-  public void log ( int severity, String option, int messageNum, Object caller, String method, Status status );
-
-  /**
-   * Logs an <code>Object</code>.
-   * @param severity The severity of the logging entry.
-   * @param messageNum  The message number.
-   * @param caller The object (for non-static methods) or class (for
-   * static methods) doing the logging.
-   * @param method The simple name of the method doing the loging.
-   * @param object The Object to log.
-   */
-  public void log ( int severity, int messageNum, Object caller, String method, Object object );
-  
-  /**
-   * Logs an <code>Object</code>.
-   * @param severity The severity of the logging entry.
-   * @param debug option
-   * @param messageNum  The message number.
-   * @param caller The object (for non-static methods) or class (for
-   * static methods) doing the logging.
-   * @param method The simple name of the method doing the loging.
-   * @param object The Object to log.
-   */
-  public void log ( int severity, String option, int messageNum, Object caller, String method, Object object );
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/common/MessageUtils.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/common/MessageUtils.java
deleted file mode 100644
index 916e609..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/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.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/env/core/common/NullProgressMonitor.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/common/NullProgressMonitor.java
deleted file mode 100644
index c9ed3a9..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/common/NullProgressMonitor.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.command.env.core.common;
-
-/**
- *  A ProgressMonitor that does nothing. 
- */
-public class NullProgressMonitor implements ProgressMonitor
-{
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.command.env.core.common.ProgressMonitor#getChildProgressMonitor()
-	 */
-	public ProgressMonitor getChildProgressMonitor() 
-	{
-		return null;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.command.env.core.common.ProgressMonitor#isCancelRequested()
-	 */
-	public boolean isCancelRequested() 
-	{
-		return false;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.command.env.core.common.ProgressMonitor#report(java.lang.String)
-	 */
-	public void report(String progress) 
-	{
-	}
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/common/NullStatusHandler.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/common/NullStatusHandler.java
deleted file mode 100644
index 0c24c43..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/common/NullStatusHandler.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.command.env.core.common;
-
-public class NullStatusHandler implements StatusHandler
-{
-  
-  /**
-   * @see org.eclipse.env.common.StatusHandler#report(org.eclipse.env.common.Status, org.eclipse.env.common.Choice[])
-   */
-  public Choice report(Status status, Choice[] choices) 
-  {
-  	Choice result = null;
-  	
-  	// Always take the first choice if available.
-    if( choices != null && choices.length > 0 )
-    {
-    	result = choices[0];
-    }
-    
-    return result;
-  }
-
-  /**
-   * @see org.eclipse.env.common.StatusHandler#report(org.eclipse.env.common.Status)
-   */
-  public void report(Status status) throws StatusException
-  {
-  }
-  
-  /*
-   * Report a warning.
-   */
-  private boolean reportWarning(Status status)
-  {
-    return true;
-  }
-
-  /*
-   * Report and error.
-   */
-  private boolean reportErrorStatus(Status status)
-  {
-    return false;
-  }
-  
-  /**
-   * @see org.eclipse.wst.command.env.core.common.StatusHandler#reportError(org.eclipse.wst.command.env.core.common.Status)
-   */
-  public void reportError(Status status)
-  {
-    reportErrorStatus( status );
-  }
-  
-  /**
-   * @see org.eclipse.wst.command.env.core.common.StatusHandler#reportInfo(org.eclipse.wst.command.env.core.common.Status)
-   */
-  public void reportInfo(Status status)
-  {
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/common/ProgressMonitor.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/common/ProgressMonitor.java
deleted file mode 100644
index c63153e..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/common/ProgressMonitor.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.command.env.core.common;
-
-public interface ProgressMonitor
-{
-  /**
-   * Reports progress.
-   */
-  public void report ( String progress );
-
-  /**
-   * Returns a new progress monitor that will record progress
-   * messages as "children" of the message most recently reported
-   * thru the parent monitor.
-   */
-  public ProgressMonitor getChildProgressMonitor ();
-
-  /**
-   * Returns true if the environment has requested cancellation
-   * of the operation in progress. It is entirely up to a Command
-   * to decide if, and when, to consult this method.
-   */
-  public boolean isCancelRequested ();
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/common/Range.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/common/Range.java
deleted file mode 100644
index b30b4ae..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/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.env.core.common;
-
-import org.eclipse.wst.command.env.core.uri.URI;
-
-/**
- * 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 URI 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/env/core/common/RangeVector.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/common/RangeVector.java
deleted file mode 100644
index c208685..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/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.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/env/core/common/SimpleStatus.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/common/SimpleStatus.java
deleted file mode 100644
index 51b3689..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/common/SimpleStatus.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.command.env.core.common;
-
-import java.util.List;
-import java.util.LinkedList;
-import java.util.Iterator;
-
-/**
- * A usually sufficient implementation of Status.
- */
-public class SimpleStatus implements Status
-{
-  
-  private List children_ = new LinkedList();
-  private String id_;
-  private String message_;
-  private int severity_;
-  private Throwable throwable_;
-
-  /**
-   * Method SimpleStatus.
-   * @param id
-   */
-  public SimpleStatus ( String id )
-  {
-    this(id,"",OK,null);
-  }
-
-  /**
-   * Method SimpleStatus.
-   * @param id
-   * @param message
-   * @param severity
-   */
-  public SimpleStatus ( String id, String message, int severity )
-  {
-    this(id,message,severity,null);
-  }
-
-  /**
-   * Method SimpleStatus.
-   * @param id
-   * @param message
-   * @param children
-   */
-  public SimpleStatus ( String id, String message, Status[] children )
-  {
-    this(id,message,OK,null);
-    for (int i=0; i<children.length; i++)
-    {
-      children_.add(children[i]);
-    }
-  }
-
-  /**
-   * Method SimpleStatus.
-   * @param id
-   * @param message
-   * @param severity
-   * @param throwable
-   */
-  public SimpleStatus ( String id, String message, int severity, Throwable throwable )
-  {
-    id_ = id;
-    message_ = message;
-    severity_ = severity;
-    throwable_ = throwable;
-  }
-
-  /**
-   * @see Status#getId()
-   */
-  public String getId ()
-  {
-    return id_;
-  }
-
-  /**
-   * @see Status#getMessage()
-   */
-  public String getMessage ()
-  {
-    return message_;
-  }
-
-  /**
-   * @see Status#getSeverity()
-   */
-  public int getSeverity ()
-  {
-    int severity = severity_;
-    if (children_.size() > 0)
-    {
-      Iterator i = children_.iterator();
-      while (i.hasNext())
-      {
-        Status status = (Status)i.next();
-        int childSeverity = status.getSeverity();
-        if (childSeverity > severity)
-        {
-          severity = childSeverity;
-        }
-      }
-    }
-    return severity;
-  }
-
-  /**
-   * @see Status#getThrowable()
-   */
-  public Throwable getThrowable ()
-  {
-    return throwable_;
-  }
-
-  /**
-   * @see Status#hasChildren()
-   */
-  public boolean hasChildren ()
-  {
-    return children_.size() > 0;
-  }
-
-  /**
-   * @see Status#getChildren()
-   */
-  public Status[] getChildren ()
-  {
-    return (Status[])children_.toArray(new Status[0]);
-  }
-
-  /**
-   * @see Status#matches(int)
-   */
-  public boolean matches ( int mask )
-  {
-    return (getSeverity() | mask) != 0;
-  }
-
-  /**
-   * Method addChild.
-   * @param status
-   */
-  public void addChild ( Status status )
-  {
-    children_.add(status);
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/common/Status.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/common/Status.java
deleted file mode 100644
index 38e8ae3..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/common/Status.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.command.env.core.common;
-
-/**
- * Carries status information.
- */
-public interface Status
-{
-  /**
-   * Status: Everything is fine, and there are no messages or details.
-   */
-  public static final int OK = 0;
-
-  /**
-   * Status: Everything is fine, but there is information to report.
-   */
-  public static final int INFO = 1;
-
-  /**
-   * Status: Things are working, but possibly not as expected.
-   */
-  public static final int WARNING = 2;
-
-  /**
-   * Status: Blammo.
-   */
-  public static final int ERROR = 4;
-
-  /**
-   * Returns a non-translated application specific identifier.
-   * May return null.
-   */
-  public String getId ();
-
-  /**
-   * Returns a translated (locale-sensitive) message.
-   * May return null.
-   */
-  public String getMessage ();
-
-  /**
-   * Returns the severity.
-   */
-  public int getSeverity ();
-
-  /**
-   * Returns an exception (throwable) behind the status, if any.
-   * May return null.
-   */
-  public Throwable getThrowable ();
-
-  /**
-   * Returns true if this status object has child status objects.
-   */
-  public boolean hasChildren ();
-
-  /**
-   * Returns the immediate child Status objects of this object.
-   * Never returns null, but may return a zero-length array.
-   */
-  public Status[] getChildren ();
-
-  /**
-   * Returns true if this status' severity matches the severity
-   * mask passed in. Strictly speaking:
-   * this.matches(that) == (this.getSeverity() | that != 0)
-   */
-  public boolean matches ( int mask );
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/common/StatusException.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/common/StatusException.java
deleted file mode 100644
index 825bc66..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/common/StatusException.java
+++ /dev/null
@@ -1,65 +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.env.core.common;
-
-/**
- * This is the exception class used by StatusHandlers to tell their
- * callers that processing should stop.
- */
-public class StatusException extends EnvironmentException
-{
-  /**
-   * Comment for <code>serialVersionUID</code>
-   * */
-  private static final long serialVersionUID = 3618141160322119992L;
-
-  /**
-   * The Choice that lead to the exception being thrown,
-   * if any (ie. may be null).
-   */
-  protected Choice choice;
-
-  /**
-   * Creates a new StatusException with the given Status.
-   */
-  public StatusException( Status status )
-  {
-    super( status );  
-  }
-  
-  /**
-   * Creates a new StatusException with the given Choice.
-   * The Choice may be null.
-   */
-  public StatusException ( Choice choice )
-  {
-    super();
-    this.choice = choice;
-  }
-
-  /**
-   * Creates a new StatusException with the given Choice
-   * and status object. The Choice may be null.
-   */
-  public StatusException ( Status status, Choice choice )
-  {
-    super(status);
-    this.choice = choice;
-  }
-
-  /**
-   * Returns the Choice object inside this exception.
-   */
-  public Choice getChoice ()
-  {
-    return choice;
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/common/StatusHandler.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/common/StatusHandler.java
deleted file mode 100644
index be4b312..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/common/StatusHandler.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.command.env.core.common;
-
-/**
- * Processes status events raised by the caller and returns an
- * indication of choices made by the recipient of the status and
- * may raise an exception against the caller to have them abort
- * procesing.
- */
-public interface StatusHandler
-{
-  /**
-   * Reports the given Status and set of possible responses.
-   * Returns the choice made by the handler.
-   */
-  public Choice report ( Status status, Choice[] choices );
-  
-  /**
-   * Reports the given Status with implied options to either
-   * continue or abort.
-   * Throws an exception if the handler decides the caller
-   * should stop processing.
-   */
-  public void report ( Status status ) throws StatusException;
-  
-  /**
-   * Report the given Error Status.  No user feedback is provided.
-   * @param status
-   */
-  public void reportError( Status status );
-  
-  /**
-   * Report the given Info Status.  No user feedback is provided.
-   * @param status
-   */
-  public void reportInfo( Status status );
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/context/Context.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/context/Context.java
deleted file mode 100644
index 9f1c9ad..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/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.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/env/core/context/ResourceContext.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/context/ResourceContext.java
deleted file mode 100644
index a20d7b5..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/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.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/env/core/context/ResourceDefaults.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/context/ResourceDefaults.java
deleted file mode 100644
index 92c84b3..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/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.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/env/core/context/TransientResourceContext.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/context/TransientResourceContext.java
deleted file mode 100644
index a845b41..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/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.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.env.core.context.ResourceContext#setOverwriteFilesEnabled(boolean)
-   */
-  public void setOverwriteFilesEnabled(boolean enable) {
-    overWriteFiles = enable;
-  }
-  
-  /**  
-   * @see org.eclipse.wst.command.env.core.context.ResourceContext#isOverwriteFilesEnabled()
-   */
-  public boolean isOverwriteFilesEnabled() {
-    return overWriteFiles;
-  }
-
-  /**  
-   * @see org.eclipse.wst.command.env.core.context.ResourceContext#setCreateFoldersEnabled(boolean)
-   */
-  public void setCreateFoldersEnabled(boolean enable) {
-    createFolders = enable;
-  }
-  
-  /**  
-   * @see org.eclipse.wst.command.env.core.context.ResourceContext#isCreateFoldersEnabled()
-   */
-  public boolean isCreateFoldersEnabled() {
-    return createFolders;
-  }
-
-  /**  
-   * @see org.eclipse.wst.command.env.core.context.ResourceContext#setCheckoutFilesEnabled(boolean)
-   */
-  public void setCheckoutFilesEnabled(boolean enable) {
-    checkOutFiles = enable;
-  }
-  
-  /**  
-   * @see org.eclipse.wst.command.env.core.context.ResourceContext#isCheckoutFilesEnabled()
-   */
-  public boolean isCheckoutFilesEnabled() {
-    return checkOutFiles;
-  }
-  
-  /**  
-   * @see org.eclipse.wst.command.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/env/core/data/DataMappingRegistry.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/data/DataMappingRegistry.java
deleted file mode 100644
index ecf42ca..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/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.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/env/core/data/Transformer.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/data/Transformer.java
deleted file mode 100644
index 0a80f0c..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/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.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/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/env/core/fragment/AbstractCommandFragment.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/fragment/AbstractCommandFragment.java
deleted file mode 100644
index 7a3e42c..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/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.env.core.fragment;
-
-import org.eclipse.wst.command.env.core.CommandFactory;
-import org.eclipse.wst.command.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/env/core/fragment/BooleanFragment.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/fragment/BooleanFragment.java
deleted file mode 100644
index ebbda80..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/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.env.core.fragment;
-
-import org.eclipse.wst.command.env.core.CommandFactory;
-import org.eclipse.wst.command.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/env/core/fragment/ChoiceFragment.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/fragment/ChoiceFragment.java
deleted file mode 100644
index 35f80f8..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/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.env.core.fragment;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-
-import org.eclipse.wst.command.env.core.CommandFactory;
-import org.eclipse.wst.command.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/env/core/fragment/CommandFactoryFragment.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/fragment/CommandFactoryFragment.java
deleted file mode 100644
index 777bf27..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/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.env.core.fragment;
-
-import java.util.Vector;
-
-import org.eclipse.wst.command.env.core.Command;
-import org.eclipse.wst.command.env.core.CommandFactory;
-import org.eclipse.wst.command.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.provisional.ICommandFactory;
-
-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() )
-	{
-	  Command command = (Command)factory.getNextCommand();
-			
-	  commands.add( new ChildFragment( command, index++ ) );
-	}
-	
-	return commands;
-  }
-  
-  private class ChildFragment extends SimpleFragment
-  {
-	int index_;
-	
-	public ChildFragment( Command command, int index )
-	{
-	  super( command, command.getClass().getName() );
-	  index_ = index;
-	}
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/fragment/CommandFragment.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/fragment/CommandFragment.java
deleted file mode 100644
index e4fe06f..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/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.env.core.fragment;
-
-import org.eclipse.wst.command.env.core.CommandFactory;
-import org.eclipse.wst.command.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/env/core/fragment/CommandFragmentEngine.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/fragment/CommandFragmentEngine.java
deleted file mode 100644
index 56d0f72..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/fragment/CommandFragmentEngine.java
+++ /dev/null
@@ -1,378 +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.env.core.fragment;
-
-import java.util.Stack;
-
-import org.eclipse.wst.command.env.core.Command;
-import org.eclipse.wst.command.env.core.CommandFactory;
-import org.eclipse.wst.command.env.core.CommandManager;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.Log;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.command.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.core.data.DataFlowManager;
-
-
-
-/**
- * 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 Environment      environment_;
-  private Status           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, Environment 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 Status 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()
-  {
-  	CommandListEntry topEntry        = (CommandListEntry)commandStack_.lastElement();  	
-  	int              parentIndex     = topEntry.parentIndex_;
-  	CommandFragment  currentFragment = topEntry.fragment_;  
-  	boolean          continueExecute = visitTop();
-  	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();
-  	  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();
-  	    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;
-    
-	Command cmd = entry.command_;
-  	  
-  	if( cmd != null && cmd.isUndoable() && !entry.beforeExecute_ )
-	{
-	  cmd.undo( environment_ );
-	  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()
-  {  
-  	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 );
-  	  
-  	  if( lastStatus_.getSeverity() == Status.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 Status runCommand( CommandListEntry entry )
-  {
-	CommandFactory factory  = entry.fragment_.getCommandFactory();
-  	Status         status   = new SimpleStatus( "" );
-  	
-  	if( factory != null )
-  	{
-  	  Command cmd    = factory.create();
-  	  entry.command_ = cmd;
-  	    
-  	  if( cmd != null )
-  	  {
-  	    dataManager_.process( cmd );
-  	  	  
-  	    try
-  	    {
-  	      environment_.getLog().log(Log.INFO, "command", 5001, this, "runCommand", "Executing: " + cmd.getClass().getName());
-  	  	    
- 	      status = cmd.execute( environment_ ); 	      
-		  entry.beforeExecute_ = false;
-  	    }
-  	    catch( Throwable exc )
-  	    {
-  	      MessageUtils utils           = new MessageUtils( "org.eclipse.wst.command.env.core.environment", this );
-  	      SimpleStatus unexpectedError = new SimpleStatus("id", exc.getMessage(), Status.ERROR, exc );
-  	      status = new SimpleStatus( "", utils.getMessage( "MSG_ERROR_UNEXPECTED_ERROR" ), new Status[]{unexpectedError} );
-  	      environment_.getStatusHandler().reportError( status );
-  	    }
-  	    finally
-  	    {
-  	      String message = "Ok";
-  	      
-  	      if( status.getSeverity() == Status.ERROR )
-  	      {
-  	        message = "Error: " + status.getMessage(); 
-  	      }
-  	      
-	      environment_.getLog().log(Log.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 Command         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/env/core/fragment/CommandFragmentFactory.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/fragment/CommandFragmentFactory.java
deleted file mode 100644
index 6ccc47f..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/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.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/env/core/fragment/CommandFragmentFactoryFactory.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/fragment/CommandFragmentFactoryFactory.java
deleted file mode 100644
index 48076ae..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/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.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/env/core/fragment/ExtensionFragment.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/fragment/ExtensionFragment.java
deleted file mode 100644
index 2cde3a5..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/fragment/ExtensionFragment.java
+++ /dev/null
@@ -1,100 +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.env.core.fragment;
-
-import java.util.Hashtable;
-
-import org.eclipse.wst.command.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.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.env.core.fragment.CommandFragment#getNextSubFragment(org.eclipse.wst.command.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/env/core/fragment/FragmentListener.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/fragment/FragmentListener.java
deleted file mode 100644
index a762c6f..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/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.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/env/core/fragment/LoopCondition.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/fragment/LoopCondition.java
deleted file mode 100644
index aa780bb..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/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.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/env/core/fragment/LoopFragment.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/fragment/LoopFragment.java
deleted file mode 100644
index d218354..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/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.env.core.fragment;
-
-import org.eclipse.wst.command.env.core.CommandFactory;
-import org.eclipse.wst.command.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/env/core/fragment/SequenceFragment.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/fragment/SequenceFragment.java
deleted file mode 100644
index a2dcfed..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/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.env.core.fragment;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.wst.command.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/env/core/fragment/SimpleFragment.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/fragment/SimpleFragment.java
deleted file mode 100644
index 6235900..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/fragment/SimpleFragment.java
+++ /dev/null
@@ -1,80 +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.env.core.fragment;
-
-import org.eclipse.wst.command.env.core.*;
-
-/**
-  * 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 Command command, String id )
-  {
-    super( new CommandFactory()
-           {
-             public Command create()
-             {
-               return command;
-             }
-           }, 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/env/core/registry/CommandRegistry.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/registry/CommandRegistry.java
deleted file mode 100644
index cb4a9ae..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/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.env.core.registry;
-
-import org.eclipse.wst.command.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/env/core/selection/BooleanSelection.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/selection/BooleanSelection.java
deleted file mode 100644
index 3df7ea8..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/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.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/env/core/selection/ChoicesToString.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/selection/ChoicesToString.java
deleted file mode 100644
index 51ceab0..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/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.env.core.selection;
-
-import org.eclipse.wst.command.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.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/env/core/selection/DynamicList.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/selection/DynamicList.java
deleted file mode 100644
index 5ef9043..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/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.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/env/core/selection/SelectionList.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/selection/SelectionList.java
deleted file mode 100644
index 07dad30..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/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.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/env/core/selection/SelectionListChoices.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/selection/SelectionListChoices.java
deleted file mode 100644
index 7b46248..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/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.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/env/core/uri/NativeFileCommand.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/uri/NativeFileCommand.java
deleted file mode 100644
index d3a8b70..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/uri/NativeFileCommand.java
+++ /dev/null
@@ -1,137 +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.env.core.uri;
-
-import java.io.File;
-import java.util.List;
-import java.util.LinkedList;
-
-import org.eclipse.wst.command.env.core.Command;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.command.env.core.uri.URI;
-import org.eclipse.wst.command.env.core.uri.URIException;
-
-public abstract class NativeFileCommand implements Command
-{
-  protected String name;
-
-  protected String description;
-
-  protected URI[] urisToRead;
-
-  protected URI[] 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 ( URI[] urisToRead )
-  {
-    this.urisToRead = urisToRead;
-  }
-
-  public URI[] getURIsToRead ()
-  {
-    return urisToRead;
-  }
-
-  public void setURIsToWrite ( URI[] urisToWrite )
-  {
-    this.urisToWrite = urisToWrite;
-  }
-
-  public URI[] getURIsToWrite ()
-  {
-    return urisToWrite;
-  }
-
-  public Status execute ( Environment environment )
-  {
-    File[] filesToRead = getFiles(urisToRead);
-    File[] filesToWrite = getFiles(urisToWrite);
-    preProcess(filesToRead,filesToWrite);
-    Status status = execute(environment,filesToRead,filesToWrite);
-    postProcess(filesToRead,filesToWrite);
-    return status;
-  }
-
-  public abstract Status execute ( Environment environment, File[] filesToRead, File[] filesToWrite );
-
-  public boolean isUndoable ()
-  {
-    return false;
-  }
-
-  public Status undo ( Environment environment )
-  {
-    return null;
-  }
-
-  public boolean isRedoable ()
-  {
-    return false;
-  }
-
-  public Status redo ( Environment environment )
-  {
-    return null;
-  }
-
-  private void preProcess ( File[] filesToRead, File[] filesToWrite )
-  {
-    // TBD.
-  }
-
-  private void postProcess ( File[] filesToRead, File[] filesToWrite )
-  {
-    // TBD.
-  }
-
-  private File[] getFiles ( URI[] 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.core/src/org/eclipse/wst/command/env/core/uri/RelativeScheme.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/uri/RelativeScheme.java
deleted file mode 100644
index 207f959..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/uri/RelativeScheme.java
+++ /dev/null
@@ -1,80 +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.env.core.uri;
-
-import java.net.URL;
-
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-
-
-public class RelativeScheme implements URIScheme
-{
-
-  /* (non-Javadoc)
-   * @see org.eclipse.env.uri.URIScheme#isHierarchical()
-   */
-  public boolean isHierarchical()
-  {
-    return true;
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.env.uri.URIScheme#isValid(org.eclipse.env.uri.URI)
-   */
-  public boolean isValid(URI uri)
-  {
-    return !uri.toString().startsWith( "/" );
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.env.uri.URIScheme#newURI(java.lang.String)
-   */
-  public URI newURI(String uri) 
-  {
-    return new RelativeURI( uri );
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.env.uri.URIScheme#newURI(org.eclipse.env.uri.URI)
-   */
-  public URI newURI(URI uri) 
-  {
-    return new RelativeURI( uri.toString() );
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.env.uri.URIScheme#newURI(java.net.URL)
-   */
-  public URI newURI(URL url) 
-  {
-    return new RelativeURI( url.toString() );
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.env.uri.URIScheme#validate(org.eclipse.env.uri.URI)
-   */
-  public Status validate(URI uri)
-  {
-    Status result = null;
-    
-    if( isValid( uri ) )
-    {
-      result = new SimpleStatus( "", "", Status.OK );
-    }
-    else
-    {
-      result = new SimpleStatus( "", "", Status.ERROR );      
-    }
-    
-    return result;
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/uri/RelativeURI.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/uri/RelativeURI.java
deleted file mode 100644
index 2d177fc..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/uri/RelativeURI.java
+++ /dev/null
@@ -1,286 +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.env.core.uri;
-
-import java.io.File;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-
-
-public class RelativeURI implements URI
-{
-  protected String uri_;
-  
-  public RelativeURI( String uri )
-  {
-    uri_ = uri;   
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.env.uri.URI#append(org.eclipse.env.uri.URI)
-   */
-  public URI append(URI relativeURI) throws URIException
-  {
-    if( !relativeURI.isRelative()) 
-     {
-      MessageUtils msg = new MessageUtils( "org.eclipse.wst.command.env.core.environment", new Dummy() );
-      
-      throw new URIException( 
-          new SimpleStatus( "RelativeURI", 
-              msg.getMessage( "MSG_URI_NOT_RELATIVE", new Object[]{ relativeURI.toString() }),
-              Status.ERROR ));
-    }
-    
-    String newURI = uri_ + "/" + relativeURI.toString();
-    
-    return getURIScheme().newURI( newURI );
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.env.uri.URI#asFile()
-   */
-  public File asFile() 
-  {
-    return null;
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.env.uri.URI#asString()
-   */
-  public String asString()
-  {
-    return uri_;
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.env.uri.URI#toString()
-   */
-  public String toString()
-  {
-    return uri_;
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.env.uri.URI#asURL()
-   */
-  public URL asURL() throws URIException
-  {
-    URL url = null;
-    
-    try
-    {
-      url = new URL( uri_ );
-    }
-    catch( MalformedURLException exc )
-    {
-      throw new URIException( 
-              new SimpleStatus( "RelativeURI", exc.getMessage(), Status.ERROR ),
-            this ); 
-    }
-    
-    return url;
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.env.uri.URI#erase()
-   */
-  public void erase() throws URIException
-  {
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.env.uri.URI#getInputStream()
-   */
-  public InputStream getInputStream() throws URIException
-  {
-    return null;
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.env.uri.URI#getOutputStream()
-   */
-  public OutputStream getOutputStream() throws URIException
-  {
-    return null;
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.env.uri.URI#getURIScheme()
-   */
-  public URIScheme getURIScheme()
-  {
-    return new RelativeScheme();
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.env.uri.URI#isAvailableAsFile()
-   */
-  public boolean isAvailableAsFile()
-  {
-    return false;
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.env.uri.URI#isAvailableAsURL()
-   */
-  public boolean isAvailableAsURL()
-  {
-    return true;
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.env.uri.URI#isHierarchical()
-   */
-  public boolean isHierarchical()
-  {
-    return true;
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.env.uri.URI#isLeaf()
-   */
-  public boolean isLeaf()
-  {
-    return false;
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.env.uri.URI#isPresent()
-   */
-  public boolean isPresent()
-  {
-    return false;
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.env.uri.URI#isReadable()
-   */
-  public boolean isReadable()
-  {
-    return false;
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.env.uri.URI#isRelative()
-   */
-  public boolean isRelative()
-  {
-    return true;
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.env.uri.URI#isWritable()
-   */
-  public boolean isWritable()
-  {
-    return false;
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.env.uri.URI#list()
-   */
-  public URI[] list() throws URIException
-  {
-    return new URI[0];
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.env.uri.URI#list(org.eclipse.env.uri.URIFilter)
-   */
-  public URI[] list(URIFilter uriFilter) throws URIException
-  {
-    return new URI[0];
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.env.uri.URI#parent()
-   */
-  public URI parent() throws URIException
-  {
-    int lastSlash  = uri_.lastIndexOf( '/' );
-    int firstSlash = uri_.indexOf( '/' );
-    
-    // If there is a parent, then it must start with a slash
-    // and end with a slash.
-    if( lastSlash == -1 || firstSlash == -1 ) return null;
-        
-    return getURIScheme().newURI( uri_.substring(0, lastSlash ) );
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.env.uri.URI#rename(org.eclipse.env.uri.URI)
-   */
-  public void rename(URI newURI) throws URIException
-  {
-    uri_ = newURI.toString();
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.env.uri.URI#touchFolder()
-   */
-  public void touchFolder() throws URIException
-  {
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.env.uri.URI#touchLeaf()
-   */
-  public void touchLeaf() throws URIException
-  {
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.env.uri.URI#visit(org.eclipse.env.uri.URIVisitor, org.eclipse.env.uri.URIFilter)
-   */
-  public void visit(URIVisitor uriVisitor, URIFilter uriFilter)
-    throws URIException
-  {
-    boolean continueVisit = true;
-    
-    // If the filter accepts this we will visit it.
-    if( uriFilter.accepts( this ) )
-    {
-      continueVisit = uriVisitor.visit( this );  
-    }
-       
-    URI[] children  = list();
-    
-    for( int index = 0; index < children.length && continueVisit; index++ )
-    {
-      children[index].visit( uriVisitor, uriFilter );
-    }  
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.env.uri.URI#visit(org.eclipse.env.uri.URIVisitor)
-   */
-  public void visit(URIVisitor uriVisitor) throws URIException
-  {
-    boolean continueVisit = uriVisitor.visit( this );  
-    
-    URI[] children  = list();
-    
-    for( int index = 0; index < children.length && continueVisit; index++ )
-     {
-      children[index].visit( uriVisitor );
-    }  
-  }
-    
-  private class Dummy 
-  {
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/uri/SimpleURIFactory.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/uri/SimpleURIFactory.java
deleted file mode 100644
index dcaaf11..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/uri/SimpleURIFactory.java
+++ /dev/null
@@ -1,97 +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.env.core.uri;
-
-import java.net.URL;
-import java.util.Hashtable;
-
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-
-
-public class SimpleURIFactory implements URIFactory
-{
-  private Hashtable    schemes_ = new Hashtable();
-  private MessageUtils msg_     = new MessageUtils( "org.eclipse.wst.command.env.core.environment", this );
-  
-  
-  /* (non-Javadoc)
-   */
-  public URI newURI(String uri) throws URIException
-  {
-    URIScheme scheme = newURIScheme( uri );
-    
-    return scheme.newURI( uri );
-  }
-
-  /* (non-Javadoc)
-   */
-  public URI newURI(URL url) throws URIException
-  {
-    URIScheme scheme = newURIScheme( url.toString() );
-    
-    return scheme.newURI( url );
-  }
-
-  /* (non-Javadoc)
-   */
-  public URIScheme newURIScheme(String schemeOrURI) throws URIException
-  {
-    URIScheme newScheme = null;
-    
-    if( schemeOrURI == null )
-    {
-      throw new URIException( 
-              new SimpleStatus( "SimpleURIFactory",
-                                msg_.getMessage( "MSG_NULL_ARG_SPECIFIED", new Object[]{"newURIScheme"}),
-                                Status.ERROR ) );
-    }
-    
-    int colon    = schemeOrURI.indexOf(':');
-    int slash    = schemeOrURI.indexOf('/');
-    
-    // A protocol was specified.  Note: a colon appearing after a path is not
-    // considered part of the protocol for this URI.
-    if( (colon != -1 && slash == -1) || ( colon != -1 && colon < slash ) )
-    {
-      String protocol = schemeOrURI.substring(0, colon );
-      newScheme       = (URIScheme)schemes_.get( protocol );
-      
-      if( newScheme == null )
-      {
-        throw new URIException( 
-            new SimpleStatus( "SimpleURIFactory",
-                msg_.getMessage( "MSG_SCHEME_NOT_FOUND", new Object[]{ schemeOrURI }),
-                Status.ERROR ) );       
-      }
-    }
-    else if( schemeOrURI.startsWith( "/") )
-    {
-      throw new URIException( 
-          new SimpleStatus( "SimpleURIFactory",
-              msg_.getMessage( "MSG_ABSOLUTE_PATH_WITHOUT_SCHEME", new Object[]{ schemeOrURI }),
-              Status.ERROR ) );
-      
-    }
-    else
-    {
-      newScheme = new RelativeScheme();
-    }
-    
-    return newScheme;
-  }
-  
-  public void registerScheme( String protocol, URIScheme scheme )
-  {
-    schemes_.put( protocol, scheme );
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/uri/URI.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/uri/URI.java
deleted file mode 100644
index 93f1277..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/uri/URI.java
+++ /dev/null
@@ -1,202 +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.env.core.uri;
-
-import java.io.File;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.URL;
-
-/**
- * A URI represents a Univeral Resource Identifer.
- */
-public interface URI
-{
-  /**
-   * Returns the string form of the URI.
-   * The resource need not exist.
-   */
-  public String toString ();
-
-  /**
-   * Returns the URIScheme for the scheme of this URI.
-   * The resource need not exist.
-   */
-  public URIScheme getURIScheme ();
-
-  /**
-   * Returns true iff the resource identified by this URI exists.
-   */
-  public boolean isPresent ();
-
-  /**
-   * Returns true iff the resource identified by this URI exists
-   * and is a leaf. Returns true always for non-hierarchical schemes.
-   */
-  public boolean isLeaf ();
-
-  /**
-   * Returns true iff the resource identified by this URI exists
-   * and is readable. A readable leaf resource indicates that an
-   * input stream can be opened on the resource. A readable folder
-   * resource indicates that the children of the folder, if any,
-   * can be determined via the list() or visit() methods.
-   */
-  public boolean isReadable ();
-
-  /**
-   * Returns true iff the resource identified by this URI exists
-   * and is writable. A writable leaf resource indicates that an
-   * output stream can be opened on the resource. A writable folder
-   * resource indicates that new resources can be created in the folder.
-   */
-  public boolean isWritable ();
-
-  /**
-   * Returns true iff this URI belongs to a hierarchical scheme.
-   * The resource need not exist.
-   * this.isHierarchical() == this.getURIScheme().isHierarchical().
-   */
-  public boolean isHierarchical ();
-
-  /**
-   * Returns true iff this URI is a relative URI.
-   * The resource need not exist.
-   */
-  public boolean isRelative ();
-
-  /**
-   * Returns the URI of the folder containing this URI.
-   * The resource need not exist.
-   */
-  public URI parent () throws URIException;
-
-  /**
-   * Returns a new, normalized URI formed by appending the given
-   * relative URI to this URI. Both URIs must be hierarchical.
-   * The resulting URI will always be hierarchical. The given
-   * URI must be relative. This URI can be relative or absolute.
-   * the resulting URI will be equivalently relative or absolute.
-   */
-  public URI append ( URI relativeURI ) throws URIException;
-
-  /**
-   * Gets an InputStream for reading from the resource
-   * identified by this leaf or non-hierarchical URI.
-   */
-  public InputStream getInputStream () throws URIException;
-
-  /**
-   * Gets an OutputStream for writing to the resource
-   * identified by this leaf or non-hierarchical URI.
-   */
-  public OutputStream getOutputStream () throws URIException;
-
-  /**
-   * Creates a new, empty resource at the location identified by
-   * the URI. On completion, this.isLeaf() == true. If a leaf
-   * resource already exists, this method does nothing. If a
-   * non-leaf resource already exists under this URI, creation
-   * will fail and an exception will be thrown.
-   */
-  public void touchLeaf () throws URIException;
-
-  /**
-   * Creates a new folder resource at the location identified by
-   * the URI. The scheme of the URI must be hierarchical.
-   * On completion, this.isLeaf() == false. If a folder resource
-   * already exists, this method does nothing. If a leaf resource
-   * already exists under this URI, creation will fail and an
-   * exception will be thrown.
-   */
-  public void touchFolder () throws URIException;
-
-  /**
-   * Erases the resource identified by this URI.
-   */
-  public void erase () throws URIException;
-
-  /**
-   * Renames or moves the resource identified by this URI
-   * to the new URI.
-   */
-  public void rename ( URI newURI ) throws URIException;
-
-  /**
-   * Visits this resource and its decendants in pre-order fashion.
-   * For each resource, whether a folder or a leaf, the given
-   * URIVisitor's visit() method is called with the URI of the
-   * resource. If URIVisitor.visit() returns false, the visiting
-   * algorithm will "prune" the decendants of the resource and
-   * carry on visiting the rest of the tree. If URIVisitor.visit()
-   * returns true, the visiting algorithm will continue its walk
-   * down the resource's descendants.
-   */
-  public void visit ( URIVisitor uriVisitor ) throws URIException;
-
-  /**
-   * As for visit(URIVisitor), except only resource URIs that are
-   * accepted by the given filter are visited. If a folder resource
-   * fails to be accepted by the filter, this will not prevent the
-   * visiting algorithm from walking the resource's descendants.
-   * It remains the job of the visitor to choose whether or not to
-   * prune a branch by returning false or true.
-   */
-  public void visit ( URIVisitor uriVisitor, URIFilter uriFilter ) throws URIException;
-
-  /**
-   * Returns a list of URIs for the immediate children of the given
-   * hierarchical, non-leaf URI. This method never returns null,
-   * though it may return a zero length array.
-   */
-  public URI[] list () throws URIException;
-
-  /**
-   * As for list(), except only URIs that are accepted by the given
-   * filter are returned in the array. This method never returns null,
-   * though it may return a zero length array.
-   */
-  public URI[] list ( URIFilter uriFilter ) throws URIException;
-
-  /**
-   * Returns true if the asURL() method is fair game,
-   * in other words, if this URI can be converted into a URL.
-   */
-  public boolean isAvailableAsURL ();
-
-  /**
-   * Returns a URL object for the resource under this URI.
-   * There are many URIs and URISchemes for which this method
-   * will fail and throw an exception. It should be used only
-   * in cases where URIs are known to be representable as URLs.
-   */
-  public URL asURL () throws URIException;
-
-  /**
-   * Returns true if the asFile() method is fair game,
-   * in other words, if this URI can be converted into a File.
-   */
-  public boolean isAvailableAsFile ();
-
-  /**
-   * Returns a File object for the resource under this URI.
-   * There are many URIs and URISchemes for which this method
-   * will fail and throw an exception. It should be used only
-   * in cases where URIs are known to be backed by physical files.
-   */
-  public File asFile () throws URIException;
-
-  /**
-   * Returns the URI as a string.
-   * Equivalent to toString().
-   */
-  public String asString ();
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/uri/URIException.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/uri/URIException.java
deleted file mode 100644
index 1226212..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/uri/URIException.java
+++ /dev/null
@@ -1,76 +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.env.core.uri;
-
-import org.eclipse.wst.command.env.core.common.Status;
-
-/**
- * This is the base class for most exceptions thrown by URI classes.
- * Every URIException carries a URI and a Status, each of which may
- * be null. The getMessage() method as inherited from Exception will
- * return the message from the URIExceptin's Status object, if any.
- */
-public class URIException extends Exception
-{
-  /**
-   * Comment for <code>serialVersionUID</code>
-   */
-  private static final long serialVersionUID = 3258130271424756018L;
-
-  /**
-   * A Status object containing details about the exception,
-   * if applicable.
-   */
-  protected Status status;
-
-  /**
-   * The URI for which the exception occured,
-   * if applicable.
-   */
-  protected URI uri;
-
-  /**
-   * Creates a new URIException with the given Status.
-   * The status may be null.
-   */
-  public URIException ( Status status )
-  {
-    super();
-    this.status = status;
-  }
-
-  /**
-   * Creates a new URIException for the given Status and URI,
-   * each of which may be null.
-   */
-  public URIException ( Status status, URI uri )
-  {
-    super(status != null ? status.getMessage() : null);
-    this.status = status;
-    this.uri = uri;
-  }
-
-  /**
-   * Returns the Status object inside this exception.
-   */
-  public Status getStatus ()
-  {
-    return status;
-  }
-
-  /**
-   * Returns the URI inside this exception.
-   */
-  public URI getURI ()
-  {
-    return uri;
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/uri/URIFactory.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/uri/URIFactory.java
deleted file mode 100644
index 6d7b8f0..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/uri/URIFactory.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.env.core.uri;
-
-import java.net.URL;
-
-/**
- * This is a factory for creating new URI and URIScheme objects.
- */
-public interface URIFactory
-{
-  /**
-   * Creates and returns a new URI for the given string.
-   */
-  public URI newURI ( String uri ) throws URIException;
-
-  /**
-   * Creates and returns a new URI for the given URL.
-   */
-  public URI newURI ( URL url ) throws URIException;
-
-  /**
-   * Creates and returns a new URIScheme for the given scheme string.
-   * If the string contains no colons, the entire string is interpretted
-   * as the name of the scheme. If the string contains a colon, then the
-   * substring up to but excluding the first colon is interpretted as the
-   * name of the scheme, meaning the caller can pass in any URI string in
-   * order to get a URIScheme object.
-   */
-  public URIScheme newURIScheme ( String schemeOrURI ) throws URIException;
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/uri/URIFilter.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/uri/URIFilter.java
deleted file mode 100644
index bfeab9d..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/uri/URIFilter.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.env.core.uri;
-
-/**
- * This interface is implemented by classes that visit or list URIs.
- * Refer to {@link URI#getChildren}.
- */
-public interface URIFilter
-{
-  /**
-   * Filters the given URI.
-   * @param uri The resource to filter.
-   * @return True if the resource matches the filter,
-   * false if it does not.
-   * @throws URIException If the filter fails to analyze the resource.
-   */
-  public boolean accepts ( URI uri ) throws URIException;
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/uri/URIScheme.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/uri/URIScheme.java
deleted file mode 100644
index df77e09..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/uri/URIScheme.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.wst.command.env.core.uri;
-
-import java.net.URL;
-
-import org.eclipse.wst.command.env.core.common.Status;
-
-/**
- * A URIScheme represents a single scheme for some a family of
- * Univeral Resource Identifiers. Examples include "file", "http"
- * and "platform" (Eclipse).
- */
-public interface URIScheme
-{
-  /**
-   * Returns a new URI.
-   */
-  public URI newURI ( String uri ) throws URIException;
-
-  /**
-   * Returns a new URI.
-   */
-  public URI newURI ( URL url ) throws URIException;
-
-  /**
-   * Returns a new URI.
-   */
-  public URI newURI ( URI uri ) throws URIException;
-
-  /**
-   * Returns the proper name of the scheme.
-   */
-  public String toString ();
-
-  /**
-   * Returns true if and only if this is a hierarchical scheme.
-   */
-  public boolean isHierarchical ();
-
-  /**
-   * Returns true if and only if the given URI satisfies the
-   * grammatical requirements of the scheme. Absolute URIs must
-   * begin with "<scheme>:". Relative URIs must either not contain
-   * a colon, ":", or it must begin with "./".
-   */
-  public boolean isValid ( URI uri );
-
-  /**
-   * Returns a Status object indicating whether or not the given
-   * URI is valid. The severity and message of the Status object
-   * will describe this.
-   */
-  public Status validate ( URI uri );
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/uri/URIUtils.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/uri/URIUtils.java
deleted file mode 100644
index bb9b316..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/uri/URIUtils.java
+++ /dev/null
@@ -1,50 +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.env.core.uri;
-
-/**
- * This class contains several static utility methods for
- * working with URIs.
- */
-public class URIUtils
-{
-  /**
-   * Copies all bytes from the old URI to the new URI.
-   */
-  public static void copy ( URI oldUri, URI newUri ) throws URIException
-  {
-  }
-
-  /**
-   * Moves one URI to another.
-   */
-  public static void move ( URI oldUri, URI newUri ) throws URIException
-  {
-  }
-
-  /**
-   * Constructs a new, temporary leaf URI.
-   * The scheme of the URI may be, but is not guaranteed to be, "file:".
-   */
-  public static URI getTemporaryLeafURI () throws URIException
-  {
-    return null;
-  }
-
-  /**
-   * Constructs a new, temporary folder URI.
-   * The scheme of the URI may be, but is not guaranteed to be, "file:".
-   */
-  public static URI getTemporaryFolderURI () throws URIException
-  {
-    return null;
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/uri/URIVisitor.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/uri/URIVisitor.java
deleted file mode 100644
index 1a15bf7..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/uri/URIVisitor.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.env.core.uri;
-
-/**
- * This interface is implemented by classes that visit URIs.
- * Refer to {@link URI#visit}.
- */
-public interface URIVisitor
-{
-  /**
-   * Visits the given URI.
-   * @param uri The resource to visit.
-   * @return True if the resource's descendants should be visited,
-   * or false if they should not be visited.
-   * @throws URIException If the visit method fails.
-   */
-  public boolean visit ( URI uri ) throws URIException;
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/uri/file/FileScheme.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/uri/file/FileScheme.java
deleted file mode 100644
index 28572f6..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/uri/file/FileScheme.java
+++ /dev/null
@@ -1,73 +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.env.core.uri.file;
-
-import java.net.URL;
-
-import org.eclipse.wst.command.env.core.uri.RelativeScheme;
-import org.eclipse.wst.command.env.core.uri.RelativeURI;
-import org.eclipse.wst.command.env.core.uri.URI;
-
-
-public class FileScheme extends RelativeScheme 
-{
-  /* (non-Javadoc)
-   * @see org.eclipse.env.uri.URIScheme#isValid(org.eclipse.env.uri.URI)
-   */
-  public boolean isValid(URI uri)
-  {
-    return uri.toString().startsWith( "file:" );
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.env.uri.URIScheme#newURI(java.lang.String)
-   */
-  public URI newURI(String uri) 
-  {
-    String newURI = null;
-    
-    if( uri.startsWith( "file:") )
-    {
-      // The file protocol has been specified so keep it as is.
-      newURI = uri;
-    }
-    else if( uri.startsWith( "/") )
-    {
-      // The file scheme has not been specified so we will add it.
-      newURI = "file:" + uri;
-    }
-    
-    if( newURI == null )
-    {
-      return new RelativeURI( uri );
-    }
-    else
-    {
-      return new FileURI( newURI );
-    }
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.env.uri.URIScheme#newURI(org.eclipse.env.uri.URI)
-   */
-  public URI newURI(URI uri) 
-  {
-    return new FileURI( uri.toString() );
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.env.uri.URIScheme#newURI(java.net.URL)
-   */
-  public URI newURI(URL url) 
-  {
-    return new FileURI( url.toString() );
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/uri/file/FileURI.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/uri/file/FileURI.java
deleted file mode 100644
index e691670..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/uri/file/FileURI.java
+++ /dev/null
@@ -1,271 +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.env.core.uri.file;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Vector;
-
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.command.env.core.uri.RelativeURI;
-import org.eclipse.wst.command.env.core.uri.URI;
-import org.eclipse.wst.command.env.core.uri.URIException;
-import org.eclipse.wst.command.env.core.uri.URIFilter;
-import org.eclipse.wst.command.env.core.uri.URIScheme;
-
-
-public class FileURI extends RelativeURI 
-{
-  private File file_ = null;
-  
-  public FileURI( String uri )
-  {
-    super( uri );
-    
-    if( getURIScheme().isValid( this ) )
-    {
-      file_ = new File( uri.substring( 5, uri.length() ) );
-    }
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.env.uri.URI#asFile()
-   */
-  public File asFile() 
-  {
-    return file_;
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.env.uri.URI#erase()
-   */
-  public void erase() throws URIException
-  {
-    deleteFile( file_ );
-  }
-
-  private void deleteFile( File file )
-  {
-    if( file.isDirectory() )
-    {
-      File[] children = file.listFiles();
-      
-      for( int index = 0; index < children.length; index++ )
-      {
-        File child = children[index];
-        
-        if( child.isDirectory() )
-        {
-          deleteFile( child );
-        }
-        else
-        {
-          child.delete();
-        }
-      }
-    }
-    
-    file.delete();
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.env.uri.URI#getInputStream()
-   */
-  public InputStream getInputStream() throws URIException
-  {
-    FileInputStream stream = null;
-    
-    try
-    {
-      File parent = file_.getParentFile();
-      parent.mkdirs();
-      
-      stream = new FileInputStream( file_ );  
-    }
-    catch( IOException exc )
-    {
-      Status status = new SimpleStatus( "", exc.getMessage(), Status.ERROR, exc );
-      throw new URIException( status, this );
-    }
-    
-    return stream;
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.env.uri.URI#getOutputStream()
-   */
-  public OutputStream getOutputStream() throws URIException
-  {
-    FileOutputStream stream = null;
-    
-    try
-    {
-      File parent = file_.getParentFile();
-      parent.mkdirs();
-      
-      stream = new FileOutputStream( file_ );  
-    }
-    catch( IOException exc )
-    {
-      Status status = new SimpleStatus( "", exc.getMessage(), Status.ERROR, exc );
-      throw new URIException( status, this );
-    }
-    
-    return stream;
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.env.uri.URI#getURIScheme()
-   */
-  public URIScheme getURIScheme()
-  {
-    return new FileScheme();
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.env.uri.URI#isAvailableAsFile()
-   */
-  public boolean isAvailableAsFile()
-  {
-    return file_ != null;
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.env.uri.URI#isAvailableAsURL()
-   */
-  public boolean isAvailableAsURL()
-  {
-    return true;
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.env.uri.URI#isLeaf()
-   */
-  public boolean isLeaf()
-  {
-    return file_.isFile();
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.env.uri.URI#isPresent()
-   */
-  public boolean isPresent()
-  {
-    return file_.exists();
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.env.uri.URI#isReadable()
-   */
-  public boolean isReadable()
-  {
-    return file_.canRead();
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.env.uri.URI#isWritable()
-   */
-  public boolean isWritable()
-  {
-    return file_.canWrite();
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.env.uri.URI#list()
-   */
-  public URI[] list() throws URIException
-  {
-    File[] children = file_.listFiles();
-    URI[]  URIs     = new URI[0];
-    
-    if( children != null )
-    {
-      int   length   = children.length;
-      
-      URIs = new URI[length];
-    
-      for( int index = 0; index < length; index++ )
-      {
-        URIs[index] = new FileURI( "file:" + children[index].getAbsolutePath() );
-      }
-    }
-    
-    return URIs;
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.env.uri.URI#list(org.eclipse.env.uri.URIFilter)
-   */
-  public URI[] list(URIFilter uriFilter) throws URIException
-  {
-    File[]   children = file_.listFiles();
-    int      length   = children == null ? 0 : children.length;
-    Vector   URIs     = new Vector();
-    
-    for( int index = 0; index < length; index++ )
-    {
-      URI newURI = new FileURI( "file:" + children[index].getAbsolutePath() );
-      
-      if( uriFilter.accepts( newURI) )
-      {
-        URIs.add( newURI );
-      } 
-    }
-    
-    return (URI[])URIs.toArray( new URI[0] );
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.env.uri.URI#rename(org.eclipse.env.uri.URI)
-   */
-  public void rename(URI newURI) throws URIException
-  {
-    uri_ = newURI.toString();
-    file_.renameTo( new File( uri_ ) );
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.env.uri.URI#touchFolder()
-   */
-  public void touchFolder() throws URIException
-  {
-    file_.mkdirs();
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.env.uri.URI#touchLeaf()
-   */
-  public void touchLeaf() throws URIException
-  {
-    try
-    {
-      // Ensure that the parent folders are created.
-      File parent = file_.getParentFile();
-      parent.mkdirs();
-      
-      file_.createNewFile();
-    }
-    catch( IOException exc )
-    {
-      Status status = new SimpleStatus( "", exc.getMessage(), Status.ERROR, exc );
-      throw new URIException( status, this );      
-    }
-  }
-    
-  private class Dummy 
-  {
-  }
-}
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 62ac916..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/DataFlowManager.java
+++ /dev/null
@@ -1,275 +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.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.Log;
-import org.eclipse.wst.command.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.env.core.data.Transformer;
-
-
-public class DataFlowManager 
-{
-  private DataMappingRegistryImpl registry_;
-  private Hashtable               classTable_;
-  private int                     order_;
-  private Environment				environment_;
-  
-  public DataFlowManager( DataMappingRegistryImpl registry, Environment 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(Log.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(Log.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(Log.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(Log.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/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 132a09d..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/DataMappingRegistryImpl.java
+++ /dev/null
@@ -1,120 +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;
-
-import org.eclipse.wst.command.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.env.core.data.Transformer;
-
-
-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.env.core.data.DataMappingRegistry#addMapping(java.lang.Class, java.lang.String, java.lang.Class, java.lang.String, org.eclipse.wst.command.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.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 c039735..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/RuleEntry.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.data;
-
-import org.eclipse.wst.command.env.core.data.Transformer;
-
-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/provisional/ICommandFactory.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/ICommandFactory.java
deleted file mode 100644
index 1af1586..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/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.provisional;
-
-import java.util.Iterator;
-
-import org.eclipse.wst.command.env.core.Command;
-
-/**
- * 
- * This class is used to return a sequence of Commands.
- *
- */
-public interface ICommandFactory extends Iterator 
-{
-  /**
-   * 
-   * @return returns the next Command in the sequence.
-   */
-  public Command getNextCommand();
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/SimpleCommandFactory.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/SimpleCommandFactory.java
deleted file mode 100644
index a32a17d..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/SimpleCommandFactory.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.eclipse.wst.command.internal.provisional;
-
-import java.util.Vector;
-
-import org.eclipse.wst.command.env.core.Command;
-
-public class SimpleCommandFactory implements ICommandFactory 
-{
-    private Vector commands_;
-	private int    index_;
-	
-	public SimpleCommandFactory( Vector commands )
-	{
-	  commands_ = commands;
-	  index_    = 0;
-	}
-	
-	public Command getNextCommand() 
-	{
-		return (Command)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.ui/.classpath b/bundles/org.eclipse.wst.command.env.ui/.classpath
deleted file mode 100644
index 065ac06..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.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<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 272cab6..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-build.xml
-runtime
-temp.folder
-envui.jar
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/build.properties b/bundles/org.eclipse.wst.command.env.ui/build.properties
deleted file mode 100644
index 8156427..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/build.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-bin.includes = plugin.xml,\
-               *.jar,\
-               envui.jar
-src.includes = .classpath,\
-               .project,\
-               build.properties,\
-               plugin.xml,\
-               src/
-jars.compile.order = envui.jar
-source.envui.jar = src/
-output.envui.jar = bin/
diff --git a/bundles/org.eclipse.wst.command.env.ui/org/eclipse/wst/command/internal/provisional/ui/widgets/INamedWidgetContributor.java b/bundles/org.eclipse.wst.command.env.ui/org/eclipse/wst/command/internal/provisional/ui/widgets/INamedWidgetContributor.java
deleted file mode 100644
index baaba96..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/org/eclipse/wst/command/internal/provisional/ui/widgets/INamedWidgetContributor.java
+++ /dev/null
@@ -1,52 +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.provisional.ui.widgets;
-
-import org.eclipse.wst.command.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.env.ui.widgets.WidgetContributor;
-
-public interface INamedWidgetContributor 
-{
-  /**
-   * 
-   * @return returns the WidgetContributor for this Named widget.
-   */
-  public WidgetContributor getWidgetContributor();
-  
-  /**
-   * 
-   * @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();
-  
-  /**
-   * 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/org/eclipse/wst/command/internal/provisional/ui/widgets/INamedWidgetContributorFactory.java b/bundles/org.eclipse.wst.command.env.ui/org/eclipse/wst/command/internal/provisional/ui/widgets/INamedWidgetContributorFactory.java
deleted file mode 100644
index 71ccbae..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/org/eclipse/wst/command/internal/provisional/ui/widgets/INamedWidgetContributorFactory.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.eclipse.wst.command.internal.provisional.ui.widgets;
-
-public interface INamedWidgetContributorFactory 
-{
-  INamedWidgetContributor getFirstNamedWidget();
-  
-  INamedWidgetContributor getNextNamedWidget( INamedWidgetContributor widgetContributor );
-}
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 d031475..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/plugin.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin
-   id="org.eclipse.wst.command.env.ui"
-   name="%PLUGIN_NAME"
-   version="1.0.0"
-   provider-name="%PLUGIN_PROVIDER"
-   class="org.eclipse.wst.command.internal.env.ui.plugin.EnvUIPlugin">
-
-   <runtime>
-      <library name="envui.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-
-   <requires>
-      <import plugin="org.eclipse.wst.command.env.core"/>
-      <import plugin="org.eclipse.wst.command.env"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.osgi"/>
-   </requires>
-   
-   <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/eclipse/EclipseEnvironment.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/env/ui/eclipse/EclipseEnvironment.java
deleted file mode 100644
index 2a12b8b..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/env/ui/eclipse/EclipseEnvironment.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.env.ui.eclipse;
-
-import org.eclipse.wst.command.env.core.CommandManager;
-import org.eclipse.wst.command.env.core.common.JavaCompiler;
-import org.eclipse.wst.command.env.core.common.Log;
-import org.eclipse.wst.command.env.core.common.ProgressMonitor;
-import org.eclipse.wst.command.env.core.common.StatusHandler;
-import org.eclipse.wst.command.env.core.context.ResourceContext;
-import org.eclipse.wst.command.env.core.uri.SimpleURIFactory;
-import org.eclipse.wst.command.env.core.uri.URIFactory;
-import org.eclipse.wst.command.env.core.uri.file.FileScheme;
-import org.eclipse.wst.command.env.eclipse.BaseEclipseEnvironment;
-import org.eclipse.wst.command.env.eclipse.EclipseLog;
-import org.eclipse.wst.command.env.eclipse.EclipseScheme;
-
-
-/**
- * This class implements an Environment class for the Eclipse Environment.
- * This Environment 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 ProgressMonitor  monitor_         = null;
-  private StatusHandler    statusHandler_   = null;
-  
-  public EclipseEnvironment( CommandManager  commandManager, 
-		                     ResourceContext resourceContext,
-					         ProgressMonitor monitor,
-						     StatusHandler   statusHandler )
-  {
-    commandManager_  = commandManager;
-    resourceContext_ = resourceContext;
-    uriFactory_      = new SimpleURIFactory();
-    monitor_         = monitor;
-    statusHandler_   = statusHandler;
-    
-    uriFactory_.registerScheme( "platform", new EclipseScheme( this ) );
-    uriFactory_.registerScheme( "file", new FileScheme() );
-  }
-  
-  /**
-   * @see org.eclipse.wst.command.env.core.common.Environment#getCommandManager()
-   */
-  public CommandManager getCommandManager()
-  {
-    return commandManager_;
-  }
-
-  /**
-   * @see org.eclipse.wst.command.env.core.common.Environment#getJavaCompiler()
-   */
-  public JavaCompiler getJavaCompiler()
-  {
-    return null;
-  }
-
-  /**
-   * @see org.eclipse.wst.command.env.core.common.Environment#getLog()
-   */
-  public Log getLog()
-  {
-    return new EclipseLog();
-  }
-
-  /**
-   * @see org.eclipse.wst.command.env.core.common.Environment#getProgressMonitor()
-   */
-  public ProgressMonitor getProgressMonitor()
-  {
-    return monitor_;
-  }
-
- 
-  /**
-   * @see org.eclipse.wst.command.env.core.common.Environment#getStatusHandler()
-   */
-  public StatusHandler getStatusHandler()
-  {
-    return statusHandler_;
-  }
-
-  /** (non-Javadoc)
-   * @see org.eclipse.wst.command.env.core.common.Environment#getURIFactory()
-   */
-  public URIFactory getURIFactory()
-  {
-    return uriFactory_;
-  }
-
-  /**
-   * @return returns a ResourceContext for this Environment.
-   */
-  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/env/ui/eclipse/EclipseProgressMonitor.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/env/ui/eclipse/EclipseProgressMonitor.java
deleted file mode 100644
index 0eab6b8..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/env/ui/eclipse/EclipseProgressMonitor.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.command.env.ui.eclipse;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.wst.command.env.core.common.ProgressMonitor;
-
-
-public class EclipseProgressMonitor implements ProgressMonitor
-{
-  IProgressMonitor monitor_;
-  
-  public EclipseProgressMonitor()
-  {
-  }
-  
-  /**
-   * Sets an eclipse IProgressMonitor to this monitor. 
-   * @param monitor
-   */
-  public void setMonitor( IProgressMonitor monitor )
-  {
-    monitor_ = monitor;  
-  }
-  
-  /**
-   * 
-   * @return returns the Eclipse IProgressMonitor for this monitor.
-   */
-  public IProgressMonitor getMonitor()
-  {
-  	return monitor_;
-  }
-  
-  /**
-   * @see org.eclipse.env.common.ProgressMonitor#getChildProgressMonitor()
-   */
-  public ProgressMonitor getChildProgressMonitor()
-  {
-    return null;
-  }
-
-  /**
-   * @see org.eclipse.env.common.ProgressMonitor#isCancelRequested()
-   */
-  public boolean isCancelRequested()
-  {
-    return monitor_ == null ? false : monitor_.isCanceled();
-  }
-
-  /**
-   * @see org.eclipse.env.common.ProgressMonitor#report(java.lang.String)
-   */
-  public void report(String progress)
-  {
-    if( monitor_ != null ) 
-    {
-      Display currentThreadDisplay = Display.findDisplay( Thread.currentThread() );
-      
-      if( currentThreadDisplay != null )
-      {
-        monitor_.beginTask( progress, IProgressMonitor.UNKNOWN );
-      }
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/env/ui/eclipse/EclipseStatusHandler.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/env/ui/eclipse/EclipseStatusHandler.java
deleted file mode 100644
index e114bac..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/env/ui/eclipse/EclipseStatusHandler.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.command.env.ui.eclipse;
-
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.wst.command.env.core.common.Choice;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.command.env.core.common.StatusException;
-import org.eclipse.wst.command.env.core.common.StatusHandler;
-import org.eclipse.wst.command.internal.env.ui.dialog.MessageDialog;
-import org.eclipse.wst.command.internal.env.ui.dialog.StatusDialogConstants;
-
-
-/**
- * This is the Eclipse UI version of the StatusHandler
- */
-public class EclipseStatusHandler implements StatusHandler
-{
-  private Shell        shell_;
-  private MessageUtils msg_;
-  
-  public EclipseStatusHandler()
-  {
-    this( new Shell() );
-  }
-
-  public EclipseStatusHandler(Shell shell)
-  {
-    msg_   = new MessageUtils( "org.eclipse.wst.command.env.common.environment", this );
-    shell_ = shell;
-  }
-  
-  /**
-   * @see org.eclipse.env.common.StatusHandler#report(org.eclipse.env.common.Status, org.eclipse.env.common.Choice[])
-   */
-  public Choice report(Status 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.StatusHandler#report(org.eclipse.env.common.Status)
-   */
-  public void report(Status 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(Status status)
-  {
-    int userResponse =
-      MessageDialog.openMessage(
-        shell_,
-        msg_.getMessage("TITLE_WARNING"),
-        null,
-        status);
-    return (userResponse == StatusDialogConstants.OK_ID);
-  }
-
-  private boolean reportErrorStatus(Status status)
-  {
-    MessageDialog.openMessage(
-      shell_,
-      msg_.getMessage("TITLE_ERROR"),
-      null,
-      status);
-    return false;
-  }
-  
-  /**
-   * @see org.eclipse.wst.command.env.core.common.StatusHandler#reportError(org.eclipse.wst.command.env.core.common.Status)
-   */
-  public void reportError(Status status)
-  {
-    reportErrorStatus( status );
-  }
-  
-  /**
-   * @see org.eclipse.wst.command.env.core.common.StatusHandler#reportInfo(org.eclipse.wst.command.env.core.common.Status)
-   */
-  public void reportInfo(Status 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/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/CanFinishRegistry.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/env/ui/widgets/CanFinishRegistry.java
deleted file mode 100644
index 2b3f6f2..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/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.env.ui.widgets;
-
-import org.eclipse.wst.command.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/env/ui/widgets/CommandWidgetBinding.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/env/ui/widgets/CommandWidgetBinding.java
deleted file mode 100644
index c705cf4..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/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.env.ui.widgets;
-
-import org.eclipse.wst.command.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.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/env/ui/widgets/CurrentPageCommand.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/env/ui/widgets/CurrentPageCommand.java
deleted file mode 100644
index 764d217..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/env/ui/widgets/CurrentPageCommand.java
+++ /dev/null
@@ -1,37 +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.env.ui.widgets;
-
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.env.ui.widgets.WizardPageManager;
-
-
-/**
- * This Command can be used to get the current page.
- * Use of this class is not recommended.
- *
- */
-public class CurrentPageCommand extends SimpleCommand
-{
-  private WizardPageManager pageManager_;
-  
-  public CurrentPageCommand( WizardPageManager pageManager )
-  {
-    pageManager_ = pageManager;
-  }
-  
-  public IWizardPage getCurrentPage()
-  {
-    return pageManager_.getCurrentPage();
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/env/ui/widgets/DynamicWizard.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/env/ui/widgets/DynamicWizard.java
deleted file mode 100644
index 41c4280..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/env/ui/widgets/DynamicWizard.java
+++ /dev/null
@@ -1,364 +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.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.env.core.common.Condition;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.env.ui.eclipse.EclipseEnvironment;
-import org.eclipse.wst.command.env.ui.eclipse.EclipseProgressMonitor;
-import org.eclipse.wst.command.env.ui.eclipse.EclipseStatusHandler;
-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.ui.widgets.SimpleCanFinishRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimplePageFactory;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.WizardPageFactory;
-import org.eclipse.wst.command.internal.env.ui.widgets.WizardPageManager;
-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   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();
-    int                   wizardIndex   = -1;
-    
-    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];
-          wizardIndex   = index;
-          break;
-        }
-      }
-    }
-    
-    if( wizardElement_ != null )
-    {
-      commandWidgetBinding_ = (CommandWidgetBinding)wizardElement_.createExecutableExtension( "class" );
-      bundle_               = Platform.getBundle(extensions[wizardIndex].getNamespace());
-      iconBannerName_       = wizardElement_.getAttribute( "iconbanner" );
-      wizardTitle_          = wizardElement_.getAttribute( "title" );
-    }
-    
-    if( commandWidgetBinding_ == 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();
-    EclipseProgressMonitor    monitor        = new EclipseProgressMonitor();
-    EclipseEnvironment        environment    = new EclipseEnvironment( null, context, monitor, handler );
-    
-    DataMappingRegistryImpl dataRegistry_   = new DataMappingRegistryImpl();
-    SimpleWidgetRegistry    widgetRegistry_ = new SimpleWidgetRegistry();
-    
-    DataFlowManager    dataManager    = new DataFlowManager( dataRegistry_, environment );
-    
-    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 ()
-  { 
-  	return pageManager_.performFinish();
-  }
-
-  /**
-   * Undo fragments
-  */
-  public boolean performCancel ()
-  {
-  	return pageManager_.performCancel();
-  }  
-      
-  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() );
-    
-    return root;
-  }
-  
-  protected IConfigurationElement getConfigElement()
-  {
-    return wizardElement_;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/env/ui/widgets/PageWizardDataEvents.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/env/ui/widgets/PageWizardDataEvents.java
deleted file mode 100644
index 941eb37..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/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.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/env/ui/widgets/SelectionCommand.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/env/ui/widgets/SelectionCommand.java
deleted file mode 100644
index ee6f2e8..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/env/ui/widgets/SelectionCommand.java
+++ /dev/null
@@ -1,38 +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.env.ui.widgets;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-
-
-/**
- * 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 SimpleCommand
-{
-  private IStructuredSelection selection_;
-  
-  public SelectionCommand( IStructuredSelection selection )
-  {
-    selection_ = selection;  
-  }
-  
-  public IStructuredSelection getInitialSelection()
-  {
-    return selection_;
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/env/ui/widgets/SimpleCommandEngineManager.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/env/ui/widgets/SimpleCommandEngineManager.java
deleted file mode 100644
index dff89fc..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/env/ui/widgets/SimpleCommandEngineManager.java
+++ /dev/null
@@ -1,232 +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.env.ui.widgets;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.operation.IRunnableContext;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.wst.command.env.core.common.Log;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.command.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.env.core.fragment.CommandFragmentEngine;
-import org.eclipse.wst.command.env.core.fragment.FragmentListener;
-import org.eclipse.wst.command.env.ui.eclipse.EclipseEnvironment;
-import org.eclipse.wst.command.env.ui.eclipse.EclipseProgressMonitor;
-import org.eclipse.wst.command.internal.env.core.data.DataFlowManager;
-
-
-/**
- * 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 Status 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 )
-      {
-        EclipseProgressMonitor eclipseMonitor = (EclipseProgressMonitor)environment_.getProgressMonitor();
-        eclipseMonitor.setMonitor( monitor );
-        environment_.getLog().log(Log.INFO, "command", 5002, this, "getTransactionOperation", "Start of transaction");
-        engine_.moveForwardToNextStop();
-        environment_.getLog().log(Log.INFO, "command", 5003, this, "getTransactionOperation", "End of transaction");
-      }
-    };
-    
-    return operation;
-  }
-  
-  private IRunnableWithProgress getNoTransactionOperation()
-  {
-    IRunnableWithProgress operation = new IRunnableWithProgress()
-    {
-      public void run( IProgressMonitor monitor )
-      {
-        EclipseProgressMonitor eclipseMonitor = (EclipseProgressMonitor)environment_.getProgressMonitor();
-        eclipseMonitor.setMonitor( monitor );
-        environment_.getLog().log(Log.INFO, "command", 5085, this, "getNoTransactionOperation", "Start of NON transaction");
-        engine_.moveForwardToNextStop();
-        environment_.getLog().log(Log.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/env/ui/widgets/SimpleWidgetDataContributor.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/env/ui/widgets/SimpleWidgetDataContributor.java
deleted file mode 100644
index 21c7ded..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/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.env.ui.widgets;
-
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.wst.command.env.core.common.Status;
-
-
-/**
- * This class provides a simple WidgetDataContributor class that concrete 
- * WidgetDataContributors can subclass.
- *
- */
-public class SimpleWidgetDataContributor implements WidgetDataContributor
-{  
-  /**
-   * @see org.eclipse.wst.command.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.env.ui.widgets.WidgetContributor#getStatus()
-   */
-  public Status getStatus()
-  {
-    return null;
-  }
-
-  /**
-   * @see org.eclipse.wst.command.env.ui.widgets.WidgetDataEvents#externalize()
-   */
-  public void externalize()
-  {
-  }
-
-  /**
-   * @see org.eclipse.wst.command.env.ui.widgets.WidgetDataEvents#internalize()
-   */
-  public void internalize()
-  {
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/env/ui/widgets/WidgetContributor.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/env/ui/widgets/WidgetContributor.java
deleted file mode 100644
index abd330f..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/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.env.ui.widgets;
-
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.wst.command.env.core.common.Status;
-
-
-/**
- * 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 Status getStatus();
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/env/ui/widgets/WidgetContributorFactory.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/env/ui/widgets/WidgetContributorFactory.java
deleted file mode 100644
index 3f6b1b1..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/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.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/env/ui/widgets/WidgetDataContributor.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/env/ui/widgets/WidgetDataContributor.java
deleted file mode 100644
index 3147634..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/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.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/env/ui/widgets/WidgetDataEvents.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/env/ui/widgets/WidgetDataEvents.java
deleted file mode 100644
index e246ae6..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/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.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/env/ui/widgets/WidgetRegistry.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/env/ui/widgets/WidgetRegistry.java
deleted file mode 100644
index 5d1494a..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/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.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/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 4517392..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.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.command.env.core.common.Status;
-
-
-/**
- * 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,
-    Status 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.hasChildren() || status.getThrowable() != 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 66c35ce..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.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.command.env.core.common.Status;
-
-
-/**
- * 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,
-    Status 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.hasChildren())
-    {
-      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 b6788c3..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/MessageDialog.java
+++ /dev/null
@@ -1,580 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.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.env.common.StringUtils;
-import org.eclipse.wst.command.env.core.common.Choice;
-import org.eclipse.wst.command.env.core.common.Status;
-
-
-/**
- * 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 Status 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,
-    Status 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.hasChildren() || status.getThrowable() != 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,
-    Status status)
-  {
-
-    switch (status.getSeverity())
-    {
-      case Status.INFO :
-        return openInfo(
-          parent,
-          dialogTitle,
-          message,
-          status,
-          Status.OK | Status.INFO | Status.WARNING | Status.ERROR);
-      case Status.WARNING :
-        return openWarning(
-          parent,
-          dialogTitle,
-          message,
-          status,
-          Status.OK | Status.INFO | Status.WARNING | Status.ERROR);
-      default :
-        return openError(
-          parent,
-          dialogTitle,
-          message,
-          status,
-          Status.OK | Status.INFO | Status.WARNING | Status.ERROR);
-    }
-
-  }
-
-  public static int openMessage(
-    Shell parent,
-    String dialogTitle,
-    String message,
-    Status status,
-    Choice[] options)
-  {
-
-    return openOptions(
-      parent,
-      dialogTitle,
-      message,
-      status,
-      Status.OK | Status.INFO | Status.WARNING | Status.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,
-    Status 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,
-    Status 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,
-    Status 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,
-    Status 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())
-    {
-      Status childStatus = (Status) enumeration.next();
-      populateList(list, childStatus, 0);
-    }
-  }
-  private void populateList(List list, Status 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());
-    Status[] children = status.getChildren();
-    for (int i = 0; i < children.length; i++)
-    {
-      populateList(list, children[i], nesting + 1);
-    }
-  }
-  private void populateDetails(Text text, Status 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.getThrowable();
-    
-    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") );
-      }
-    }
-    
-    Status[] 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(Status status, int mask)
-  {
-    Status[] 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 11678a1..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.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.command.env.core.common.Choice;
-import org.eclipse.wst.command.env.core.common.Status;
-
-
-/**
- * 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,
-    Status 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.hasChildren())
-    {
-      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 Status.INFO :
-        return PlatformUI.getWorkbench().getDisplay().getSystemImage(SWT.ICON_INFORMATION);
-      case Status.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 91e38ef..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.jface.dialogs.IDialogConstants;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.swt.SWT;
-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,
-    Status 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.hasChildren())
-    {
-      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/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 9644fcd..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/preferences/ActionDialogsPreferencePage.java
+++ /dev/null
@@ -1,243 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.env.context.PersistentActionDialogsContext;
-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 f245cdf..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/registry/WidgetRegistry.java
+++ /dev/null
@@ -1,104 +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.provisional.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 )
-	  {
-	  }
-	  catch( Throwable exc )
-	  {
-	  }
-	}
-	
-	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/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 4e1e5bc..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/CommandWidgetBindingList.java
+++ /dev/null
@@ -1,131 +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.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.env.core.fragment.CommandFragmentFactory;
-import org.eclipse.wst.command.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.env.ui.widgets.WidgetRegistry;
-
-
-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.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.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/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 26ff0f0..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/PageInfo.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.command.internal.env.ui.widgets;
-
-import org.eclipse.wst.command.env.ui.widgets.WidgetContributorFactory;
-
-
-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/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 3877b31..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleCanFinishRegistry.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 java.util.Vector;
-
-import org.eclipse.wst.command.env.core.common.Condition;
-import org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry;
-
-
-
-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/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 284a3a7..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimplePageFactory.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;
-
-import org.eclipse.wst.command.env.ui.widgets.PageWizardDataEvents;
-
-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 97efa55..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimplePopupPageFactory.java
+++ /dev/null
@@ -1,28 +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.env.ui.widgets.PageWizardDataEvents;
-
-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 6312ab4..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.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.env.context.PersistentActionDialogsContext;
-
-
-
-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/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 9cd9327..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleWidgetRegistry.java
+++ /dev/null
@@ -1,36 +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 org.eclipse.wst.command.env.ui.widgets.WidgetContributorFactory;
-import org.eclipse.wst.command.env.ui.widgets.WidgetRegistry;
-
-
-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 a3462f7..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleWizardPage.java
+++ /dev/null
@@ -1,140 +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;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.command.env.ui.widgets.PageWizardDataEvents;
-import org.eclipse.wst.command.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.env.ui.widgets.WidgetDataEvents;
-
-
-
-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()
-  {
-    Status status  = widget_.getStatus();
-    
-    if( status != null )
-    {
-      if( status.getSeverity() == Status.ERROR )
-      {
-        String message = status.getMessage();
-
-        if( message.length() == 0 )
-        {
-          setErrorMessage( null );
-          setMessage( getDescription() );
-        }
-        else
-        {
-          setErrorMessage( message );
-        }
-          
-        setPageComplete( false );
-      }
-      else if (status.getSeverity() == Status.WARNING )
-      {
-        setErrorMessage( null );
-        setMessage(status.getMessage(), IStatus.WARNING );
-        setPageComplete( true );
-      }
-      else if( status.getSeverity() == Status.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/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 3490aba..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WizardPageFactory.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.ui.widgets;
-
-import org.eclipse.wst.command.env.ui.widgets.PageWizardDataEvents;
-
-/**
- * 
- *
- *
- *
- */
-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 c3e82fe..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WizardPageManager.java
+++ /dev/null
@@ -1,424 +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.jface.wizard.IWizard;
-import org.eclipse.jface.wizard.IWizardContainer;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.command.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.env.ui.eclipse.EclipseEnvironment;
-import org.eclipse.wst.command.env.ui.widgets.PageWizardDataEvents;
-import org.eclipse.wst.command.env.ui.widgets.SimpleCommandEngineManager;
-import org.eclipse.wst.command.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.command.internal.env.core.data.DataFlowManager;
-import org.eclipse.wst.command.internal.env.ui.registry.WidgetRegistry;
-import org.eclipse.wst.command.internal.provisional.ui.widgets.INamedWidgetContributor;
-import org.eclipse.wst.command.internal.provisional.ui.widgets.INamedWidgetContributorFactory;
-
-
-
-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_;
-    
-  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();
-	widgetRegistry_ = WidgetRegistry.instance();
-	
-	widgetStackStack_ = new Stack();
-  }
-  
-  public Status 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_ = getNextPageInGroup( widgetFactory_, false );
-		
-	//if( nextPage_ == null )
-	//{
-	  // If a page is found nextPage_ will be set to its value in the method below.
-  	//  engine_.peekForwardToNextStop();
-	//}
-  	
-    //return nextPage_ != null;
-	return true;
-  }
-  
-  public IWizardPage getNextPage()
-  {  	
-	System.out.println( "Start get next page" );
-	
-  	// 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;
-		
-  	  Status status = runForwardToNextStop();
-  	
-  	  if( status.getSeverity() == Status.ERROR )
-  	  {
-  	    // An error has occured so we need undo to the previous stop point.
-  	    undoToLastPage();
-  	  }
-	}
-	
-  	if( nextPage_ != null ) nextPage_.setWizard( wizard_ );
-  	  	
-  	return nextPage_;
-  }
-    
-  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.
-  	  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 )
-  	{
-  	  // We are moving forward one page.
-  	  WidgetDataEvents dataEvents = page.getDataEvents();
-  	  
-  	  dataManager_.process( dataEvents );  // Push model data into the new page.
-  	  dataEvents.internalize();
-  	  
-  	  page.validatePageToStatus();
-  	  
-  	  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
-  	{  	  
-  	  Status status = runForwardToNextStop();	  
-  	  
-  	  if( status.getSeverity() == Status.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 = widgetRegistry_.getFactory( fragment.getId() );
-	  
-	  if( factory != null )
-	  {
-		nextPage_ = getNextPageInGroup( factory, false );  
-	  }
-	}
-	
-    return nextPage_ == null;
-  }
-  
-  protected boolean nextFragment( CommandFragment fragment )
-  {
-	//System.out.println( "Next frag=" + fragment.getClass().getName() + " stack size=" + widgetStackStack_.size() );
-	
-    // 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_ = widgetRegistry_.getFactory( fragment.getId() );
-	  
-	  if( widgetFactory_ != null )
-	  {
-		widgetStack_ = new Stack();
-		
-		StackEntry entry = new StackEntry();
-		
-		widgetFactory_.registerDataMappings( dataManager_.getMappingRegistry() );
-		
-		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 )
-  {
-	//System.out.println( "Undo frag=" + fragment.getClass().getName() + " stack size=" + widgetStackStack_.size() );
-  	lastUndoFragment_ = fragment;
-  	
-  	return true;
-  }
-  
-  
-  private PageWizardDataEvents getNextPageInGroup( INamedWidgetContributorFactory factory, boolean pushNewWidget )
-  {
-	PageWizardDataEvents page = null;
-	
-	if( factory != null )
-	{	  
-	  INamedWidgetContributor newWidget = null;
-		  
-	  if( 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()
-  {
-	System.out.println( "Undo to last page" );
-	
-    boolean stackEmpty  = false;
-	boolean doneUndoing = false;
-    
-	while( !doneUndoing )
-	{
-	  stackEmpty = engine_.undoToLastStop();
-	  
-	  IWizardPage page = getPage( lastUndoFragment_ );
-		
-	  if( page == null && lastUndoFragment_ != null )
-	  {
-		// Check to see if a group page fragment was found.
-		INamedWidgetContributorFactory factory = widgetRegistry_.getFactory( lastUndoFragment_.getId() );
-		  
-		if( factory != null )
-		{
-		  StackEntry entry = (StackEntry)widgetStackStack_.peek();
-			
-		  widgetFactory_ = entry.factory_;
-		  widgetStack_   = entry.stack_;	
-			
-		  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 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 650737e..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/popup/DynamicPopupWizard.java
+++ /dev/null
@@ -1,209 +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.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.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.env.ui.eclipse.EclipseEnvironment;
-import org.eclipse.wst.command.env.ui.eclipse.EclipseProgressMonitor;
-import org.eclipse.wst.command.env.ui.eclipse.EclipseStatusHandler;
-import org.eclipse.wst.command.env.ui.widgets.DynamicWizard;
-import org.eclipse.wst.command.env.ui.widgets.SimpleCommandEngineManager;
-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.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.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();
-	  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 )
-  {
-	CommandFragment            rootFragment    = getRootFragment( selection, null );
-	PersistentResourceContext  resourceContext = PersistentResourceContext.getInstance();
-	EclipseStatusHandler       handler         = new EclipseStatusHandler();
-	EclipseProgressMonitor     monitor         = new EclipseProgressMonitor();
-	EclipseEnvironment         environment     = new EclipseEnvironment( null, resourceContext, monitor, 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 );
-  }
-  
-  /**
-   * @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.ui/src/org/eclipse/wst/command/internal/provisional/ui/widgets/INamedWidgetContributor.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/provisional/ui/widgets/INamedWidgetContributor.java
deleted file mode 100644
index a4fc133..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/provisional/ui/widgets/INamedWidgetContributor.java
+++ /dev/null
@@ -1,43 +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.provisional.ui.widgets;
-
-import org.eclipse.wst.command.env.ui.widgets.WidgetContributorFactory;
-
-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/provisional/ui/widgets/INamedWidgetContributorFactory.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/provisional/ui/widgets/INamedWidgetContributorFactory.java
deleted file mode 100644
index 282303a..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/provisional/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.provisional.ui.widgets;
-
-import org.eclipse.wst.command.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/provisional/ui/widgets/SimpleWidgetContributor.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/provisional/ui/widgets/SimpleWidgetContributor.java
deleted file mode 100644
index d74e3f5..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/provisional/ui/widgets/SimpleWidgetContributor.java
+++ /dev/null
@@ -1,75 +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.provisional.ui.widgets;
-
-import org.eclipse.wst.command.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.env.ui.widgets.WidgetContributorFactory;
-
-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/provisional/ui/widgets/WidgetBindingToWidgetFactoryAdapter.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/provisional/ui/widgets/WidgetBindingToWidgetFactoryAdapter.java
deleted file mode 100644
index 3817db3..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/provisional/ui/widgets/WidgetBindingToWidgetFactoryAdapter.java
+++ /dev/null
@@ -1,78 +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.provisional.ui.widgets;
-
-import java.util.Hashtable;
-
-import org.eclipse.wst.command.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.env.ui.widgets.WidgetContributorFactory;
-import org.eclipse.wst.command.env.ui.widgets.WidgetRegistry;
-
-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( pageName );
-	  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/.classpath b/bundles/org.eclipse.wst.command.env/.classpath
deleted file mode 100644
index 065ac06..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.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<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 d190fb0..0000000
--- a/bundles/org.eclipse.wst.command.env/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-build.xml
-runtime
-temp.folder
-env.jar
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/build.properties b/bundles/org.eclipse.wst.command.env/build.properties
deleted file mode 100644
index 142076d..0000000
--- a/bundles/org.eclipse.wst.command.env/build.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-bin.includes = plugin.xml,\
-               *.jar,\
-               plugin.properties,\
-               env.jar
-src.includes = .classpath,\
-               .project,\
-               build.properties,\
-               plugin.xml,\
-               src/,\
-               plugin.properties
-source.env.jar = src/
-output.env.jar = bin/
-jars.compile.order = env.jar
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 a43b890..0000000
--- a/bundles/org.eclipse.wst.command.env/plugin.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin
-   id="org.eclipse.wst.command.env"
-   name="%PLUGIN_NAME"
-   version="1.0.0"
-   provider-name="%PLUGIN_PROVIDER"
-   class="org.eclipse.wst.command.internal.env.plugin.EnvPlugin">
-
-   <runtime>
-      <library name="env.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-
-   <requires>
-      <import plugin="org.eclipse.wst.command.env.core"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.osgi"/>
-   </requires>
-
-   <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/env/common/ClassPath.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/env/common/ClassPath.java
deleted file mode 100644
index 911a7d6..0000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/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.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/env/common/EnvironmentUtils.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/env/common/EnvironmentUtils.java
deleted file mode 100644
index 4143b71..0000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/env/common/EnvironmentUtils.java
+++ /dev/null
@@ -1,118 +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.env.common;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-
-/**
- * @author cbrealey@ca.ibm.com
- * 
- * This class contains utility methods for converting between generic
- * Environment clases and Eclipse classes.
- */
-public final class EnvironmentUtils {
-	/**
-	 * Converts an Eclipse <code>IStatus</code> to an Environment
-	 * <code>Status</code>.
-	 * 
-	 * @param istatus
-	 *            The Eclipse status object.
-	 * @return An equivalent Environment status object.
-	 */
-	public static Status convertIStatusToStatus(IStatus istatus) {
-		Status status;
-		String message = istatus.getMessage();
-		IStatus[] children = istatus.getChildren();
-		int noOfChildren = children.length;
-		if (noOfChildren > 0) {
-			Status[] statusChildren = new Status[noOfChildren];
-			for (int i = 0; i < noOfChildren; i++) {
-				statusChildren[i] = convertIStatusToStatus(children[i]);
-			}
-
-			status = new SimpleStatus("", message, statusChildren);
-		} else {
-			int severity = istatus.getSeverity();
-			int statusSeverity = Status.OK;
-			switch (severity) {
-			case IStatus.ERROR:
-				statusSeverity = Status.ERROR;
-				break;
-			case IStatus.WARNING:
-				statusSeverity = Status.WARNING;
-				break;
-			case IStatus.INFO:
-				statusSeverity = Status.INFO;
-				break;
-			case IStatus.OK:
-				statusSeverity = Status.OK;
-				break;
-			default:
-			}
-			Throwable e = istatus.getException();
-			status = new SimpleStatus("", message, statusSeverity, e);
-		}
-
-		return status;
-	}
-
-	/**
-	 * Converts an Environment <code>Status</code> to an Eclipse
-	 * <code>IStatus</code>.
-	 * 
-	 * @param istatus
-	 *            The Environment status object.
-	 * @return An equivalent Eclipse status object.
-	 */
-	public static IStatus convertStatusToIStatus(Status status, String pluginId) {
-		IStatus istatus;
-		String message = status.getMessage();
-		Throwable throwable = status.getThrowable();
-		if (status.hasChildren()) {
-			Status[] children = status.getChildren();
-			int noOfChildren = children.length;
-			IStatus[] istatusChildren = new IStatus[noOfChildren];
-			for (int i = 0; i < noOfChildren; i++) {
-				istatusChildren[i] = convertStatusToIStatus(children[i],
-						pluginId);
-			}
-
-			istatus = new MultiStatus(pluginId, 0, istatusChildren, message,
-					throwable);
-		} else {
-			int severity = status.getSeverity();
-			int istatusSeverity = IStatus.OK;
-			switch (severity) {
-			case Status.ERROR:
-				istatusSeverity = IStatus.ERROR;
-				break;
-			case Status.WARNING:
-				istatusSeverity = IStatus.WARNING;
-				break;
-			case Status.INFO:
-				istatusSeverity = IStatus.INFO;
-				break;
-			case Status.OK:
-				istatusSeverity = IStatus.OK;
-				break;
-			default:
-			}
-			istatus = new org.eclipse.core.runtime.Status(istatusSeverity,
-					pluginId, 0, message, throwable);
-		}
-
-		return istatus;
-	}
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/env/common/FileResourceOutputStream.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/env/common/FileResourceOutputStream.java
deleted file mode 100644
index 1a514db..0000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/env/common/FileResourceOutputStream.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.env.common;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.eclipse.core.internal.resources.ResourceException;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.wst.command.env.core.common.ProgressMonitor;
-import org.eclipse.wst.command.env.core.common.StatusHandler;
-import org.eclipse.wst.command.env.core.context.ResourceContext;
-
-
-
-/**
-* 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; 
-  ProgressMonitor       fMonitor;   
-  StatusHandler         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, 
-  			ProgressMonitor monitor,
-  			StatusHandler   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 (ResourceException e )
-    	{
-    		throw new IOException(e.getMessage());
-    	}
-
-    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/env/common/FileResourceUtils.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/env/common/FileResourceUtils.java
deleted file mode 100644
index 4093564..0000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/env/common/FileResourceUtils.java
+++ /dev/null
@@ -1,672 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.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.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.command.env.core.common.Choice;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.ProgressMonitor;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.StatusException;
-import org.eclipse.wst.command.env.core.common.StatusHandler;
-import org.eclipse.wst.command.env.core.context.ResourceContext;
-
-
-
-/**
-* 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.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,
-                                ProgressMonitor progressMonitor,
-                                StatusHandler 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,
-                                    ProgressMonitor progressMonitor, 
-                                    StatusHandler statusMonitor)
-    throws CoreException
-  {
-    if (file.exists())
-    {
-      if (!resourceContext.isOverwriteFilesEnabled())
-      {
-        SimpleStatus status 
-          = new SimpleStatus("", msg_.getMessage( "MSG_ERROR_FILE_OVERWRITE_DISABLED",
-                                                  new Object[]{ file.getParent().getFullPath().toString(),
-                                                                file.getName()}),
-                             Status.WARNING );
-        
-        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())
-        {
-          SimpleStatus status 
-          = new SimpleStatus("", msg_.getMessage( "MSG_ERROR_FILE_CHECKOUT_DISABLED",
-                                                  new Object[]{ file.getParent().getFullPath().toString(),
-                                                                file.getName()}),
-                             Status.WARNING );
-          
-          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 )
-        {
-          SimpleStatus validateStatus = new SimpleStatus( "", status.getMessage(), SimpleStatus.ERROR );
-          statusMonitor.reportError( validateStatus );
-          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,
-                                       ProgressMonitor progressMonitor,
-                                       StatusHandler 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,
-    ProgressMonitor progressMonitor,
-    StatusHandler   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,
-    ProgressMonitor progressMonitor,
-    StatusHandler   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,
-       ProgressMonitor progressMonitor,
-       StatusHandler   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,
-    ProgressMonitor progressMonitor,
-    StatusHandler 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,
-    ProgressMonitor progressMonitor,
-    StatusHandler   statusHandler )
-  
-  throws CoreException
-  {
-    IResource child  = parent.findMember(folderName);
-    Choice    result = null;
-    
-    if( child == null )
-    {
-      if (!resourceContext.isCreateFoldersEnabled())  
-      {
-        result = statusHandler.report(
-                new SimpleStatus( "ResourceUtils",
-        	                      msg_.getMessage("MSG_ERROR_FOLDER_CREATION_DISABLED",
-        	                      new Object[]{ parent.getFullPath().toString(), folderName} ),
-                                  Status.WARNING, null ), 
-                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,
-    ProgressMonitor progressMonitor,
-    StatusHandler   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( 
-                new SimpleStatus( "ResourceUtils",
-          	                      msg_.getMessage( "MSG_ERROR_FILE_OVERWRITE_DISABLED",
-                                                   new Object[] {parent.getFullPath().toString(),fileName}),
-                                  Status.WARNING ),
-					  		    
-                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( 
-                         new SimpleStatus( "ResourceUtils",
-            		                       msg_.getMessage( "MSG_ERROR_FILE_CHECKOUT_DISABLED",
-                                                            new Object[]{ parent.getFullPath().toString(),fileName} ),
-                                           Status.WARNING ), 
-                         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);
-          SimpleStatus ss     = new SimpleStatus( status.getPlugin(), 
-                                                  status.getMessage(),
-                                                  status.getSeverity(), 
-												  status.getException() );
-          
-          try
-          {
-            statusHandler.report( ss );
-          }
-          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/env/common/StringUtils.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/env/common/StringUtils.java
deleted file mode 100644
index fefac6b..0000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/env/common/StringUtils.java
+++ /dev/null
@@ -1,303 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.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 = '_';
-
-  private static boolean isDelimiter(char character)
-  {
-    return "\u002D\u002E\u003A\u005F\u00B7\u0387\u06DD\u06DE".indexOf(character) != -1;
-  }
-  
-  
-}
diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/env/common/WaitForAutoBuildCommand.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/env/common/WaitForAutoBuildCommand.java
deleted file mode 100644
index b931f1a..0000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/env/common/WaitForAutoBuildCommand.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.env.common;
-
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-
-
-public class WaitForAutoBuildCommand extends SimpleCommand
-{
-  public Status execute(Environment environment) 
-  {
-  	SimpleStatus status = new SimpleStatus( "" );
-  	
-	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/env/common/environment.properties b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/env/common/environment.properties
deleted file mode 100644
index 6c160b0..0000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/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/env/context/PersistentContext.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/env/context/PersistentContext.java
deleted file mode 100644
index 0cd8135..0000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/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.env.context;
-
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.wst.command.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/env/eclipse/BaseEclipseEnvironment.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/env/eclipse/BaseEclipseEnvironment.java
deleted file mode 100644
index 643c06c..0000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/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.env.eclipse;
-
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.context.ResourceContext;
-
-
-/**
- * This interface adds resources to the base Environment.
- */
-public interface BaseEclipseEnvironment extends Environment 
-{
-  /**
-   * 
-   * @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/env/eclipse/ConsoleEclipseEnvironment.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/env/eclipse/ConsoleEclipseEnvironment.java
deleted file mode 100644
index 40c7082..0000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/env/eclipse/ConsoleEclipseEnvironment.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.env.eclipse;
-
-import org.eclipse.wst.command.env.core.CommandManager;
-import org.eclipse.wst.command.env.core.common.JavaCompiler;
-import org.eclipse.wst.command.env.core.common.Log;
-import org.eclipse.wst.command.env.core.common.NullProgressMonitor;
-import org.eclipse.wst.command.env.core.common.NullStatusHandler;
-import org.eclipse.wst.command.env.core.common.ProgressMonitor;
-import org.eclipse.wst.command.env.core.common.StatusHandler;
-import org.eclipse.wst.command.env.core.context.ResourceContext;
-import org.eclipse.wst.command.env.core.uri.SimpleURIFactory;
-import org.eclipse.wst.command.env.core.uri.URIFactory;
-import org.eclipse.wst.command.env.core.uri.file.FileScheme;
-
-
-/**
- *  This class is intended for use in a headless Eclipse environment.  
- */
-public class ConsoleEclipseEnvironment implements BaseEclipseEnvironment
-{
-	private CommandManager   commandManager_  = null;
-	private SimpleURIFactory uriFactory_      = null;
-	private ResourceContext  resourceContext_ = null;
-	private ProgressMonitor  monitor_         = null;
-	private StatusHandler    statusHandler_   = null;
-	  
-	public ConsoleEclipseEnvironment( ResourceContext resourceContext )
-	{
-	  this( null, resourceContext, new NullProgressMonitor(), new NullStatusHandler() );	
-	}
-	
-	public ConsoleEclipseEnvironment( CommandManager  commandManager, 
-	                                  ResourceContext resourceContext,
-			    	                  ProgressMonitor monitor,
-					                  StatusHandler   statusHandler )
-	{
-	  commandManager_  = commandManager;
-	  resourceContext_ = resourceContext;
-	  uriFactory_      = new SimpleURIFactory();
-	  monitor_         = monitor;
-	  statusHandler_   = statusHandler;
-	    
-	  uriFactory_.registerScheme( "platform", new EclipseScheme( this ) );
-	  uriFactory_.registerScheme( "file", new FileScheme() );
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.command.env.eclipse.BaseEclipseEnvironment#getResourceContext()
-	 */
-	public ResourceContext getResourceContext() 
-	{
-		return resourceContext_;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.command.env.core.common.Environment#getCommandManager()
-	 */
-	public CommandManager getCommandManager() 
-	{
-		return commandManager_;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.command.env.core.common.Environment#getJavaCompiler()
-	 */
-	public JavaCompiler getJavaCompiler() 
-	{
-		return null;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.command.env.core.common.Environment#getLog()
-	 */
-	public Log getLog() 
-	{
-		return new EclipseLog();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.command.env.core.common.Environment#getProgressMonitor()
-	 */
-	public ProgressMonitor getProgressMonitor() 
-	{
-		return monitor_;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.command.env.core.common.Environment#getStatusHandler()
-	 */
-	public StatusHandler getStatusHandler() 
-	{
-		return statusHandler_;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.command.env.core.common.Environment#getURIFactory()
-	 */
-	public URIFactory getURIFactory() 
-	{
-		return uriFactory_;
-	}
-}
diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/env/eclipse/EclipseLog.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/env/eclipse/EclipseLog.java
deleted file mode 100644
index 1cafab1..0000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/env/eclipse/EclipseLog.java
+++ /dev/null
@@ -1,177 +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.env.eclipse;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.command.env.core.common.Log;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.command.internal.env.plugin.EnvPlugin;
-
-public class EclipseLog implements Log 
-{
-//	private Logger logger;
-	public EclipseLog() {
-		/*
-		logger = Logger.getLogger("org.eclipse.wst.command.env");
-		// logger.setLogFileName("env.log");
-		logger.setLevel(Level.INFO); // log all levels for now
-		*/
-	}
-	
-	/**
-	 * @see org.eclipse.wst.command.env.core.common.Log#isEnabled()
-	 */
-	public boolean isEnabled() {
-		return EnvPlugin.getInstance().isDebugging();
-	}
-	
-	/**
-	 * @see org.eclipse.wst.command.env.core.common.Log#isEnabled(java.lang.String)
-	 */
-	public boolean isEnabled(String option) {
-		return "true".equals(Platform.getDebugOption("org.eclipse.wst.command.env/trace/"
-				+ option));
-	}
-	
-	/**
-	 * @see org.eclipse.wst.command.env.core.common.Log#log(int, int, java.lang.Object, java.lang.String, java.lang.Object)
-	 */
-	public void log(int severity, int messageNum, Object caller,
-			String method, Object object) {
-		
-		if (isEnabled()) {
-			switch (severity) {
-				case Log.ERROR :
-					if (isEnabled("error"))
-//						logger
-//								.logError(getMessageNumString(messageNum) + "E "
-//										+ caller + "::" + method + ": object="
-//										+ object);
-						System.out.println(getMessageNumString(messageNum) + "E "
-							+ caller + "::" + method + ": object="
-							+ object);
-					break;
-				case Log.WARNING :
-					if (isEnabled("warning"))
-//						logger
-//								.logWarning(getMessageNumString(messageNum)
-//										+ "W " + caller + "::" + method
-//										+ ": object=" + object);
-						System.out.println(getMessageNumString(messageNum)
-								+ "W " + caller + "::" + method
-								+ ": object=" + object);
-					break;
-				case Log.INFO :
-					if (isEnabled("info"))
-//						logger
-//								.logInfo(getMessageNumString(messageNum) + "I "
-//										+ caller + "::" + method + ": object="
-//										+ object);
-						System.out.println(getMessageNumString(messageNum) + "I "
-								+ caller + "::" + method + ": object="
-								+ object);
-					break;
-			}
-		}
-		
-	}
-	
-	/**
-	 * @see org.eclipse.wst.command.env.core.common.Log#log(int, int, java.lang.Object, java.lang.String, org.eclipse.wst.command.env.core.common.Status)
-	 */
-	public void log(int severity, int messageNum, Object caller,
-			String method, Status status) {
-		log(severity, messageNum, caller, method, (Object)status);
-	}
-	
-	/**
-	 * @see org.eclipse.wst.command.env.core.common.Log#log(int, int, java.lang.Object, java.lang.String, java.lang.Throwable)
-	 */
-	public void log(int severity, int messageNum, Object caller,
-			String method, Throwable throwable) {
-		log( severity, messageNum, caller, method, (Object)null );
-		throwable.printStackTrace();
-		/*
-		if (isEnabled()) {
-			switch (severity) {
-				case Log.ERROR :
-					if (isEnabled("error"))
-						logger.logError(getMessageNumString(messageNum) + "E "
-								+ caller + "::" + method);
-					logger.logError(throwable);
-					break;
-				case Log.WARNING :
-					if (isEnabled("warning"))
-						logger.logWarning(getMessageNumString(messageNum) + "W "
-								+ caller + "::" + method);
-					logger.logWarning(throwable);
-					break;
-				case Log.INFO :
-					if (isEnabled("info"))
-						logger.logInfo(getMessageNumString(messageNum) + "I "
-								+ caller + "::" + method);
-					logger.logInfo(throwable);
-					break;
-			}
-		}
-		*/
-	}
-	
-	/**
-	 * @see org.eclipse.wst.command.env.core.common.Log#log(int, java.lang.String, int, java.lang.Object, java.lang.String, java.lang.Object)
-	 */
-	public void log(int severity, String option, int messageNum,
-			Object caller, String method, Object object) {
-		/*
-		if (isEnabled(option))
-			logger.logInfo(getMessageNumString(messageNum) + "I " + caller
-					+ "::" + method + ": object=" + object);
-		*/
-		if (isEnabled(option))
-			System.out.println(getMessageNumString(messageNum) + "I " + caller
-					+ "::" + method + ": object=" + object);
-	}
-	
-	/**
-	 * @see org.eclipse.wst.command.env.core.common.Log#log(int, java.lang.String, int, java.lang.Object, java.lang.String, java.lang.Throwable)
-	 */
-	public void log(int severity, String option, int messageNum,
-			Object caller, String method, Throwable throwable) {
-		/*
-		if (isEnabled(option)) {
-			logger.logInfo(getMessageNumString(messageNum) + "I " + caller
-					+ "::" + method);
-			logger.logInfo(throwable);
-		}
-		*/
-		if (isEnabled(option)) {
-			System.out.println(getMessageNumString(messageNum) + "I " + caller
-					+ "::" + method);
-			throwable.printStackTrace();
-		}
-	}
-	
-	/**
-	 * @see org.eclipse.wst.command.env.core.common.Log#log(int, java.lang.String, int, java.lang.Object, java.lang.String, org.eclipse.wst.command.env.core.common.Status)
-	 */
-	public void log(int severity, String option, int messageNum,
-			Object caller, String method, Status status) {
-		log(severity, option, messageNum, caller, method, (Object)status);
-	}
-	
-	private String getMessageNumString(int messageNum) {
-		String messageNumString = "IWAB";
-		if (messageNum > 9999 || messageNum < 0)
-			messageNum = 9999; //default message number
-		messageNumString += (new Integer(messageNum)).toString();
-		return messageNumString;
-	}
-}
diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/env/eclipse/EclipseScheme.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/env/eclipse/EclipseScheme.java
deleted file mode 100644
index 5499711..0000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/env/eclipse/EclipseScheme.java
+++ /dev/null
@@ -1,185 +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.env.eclipse;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.command.env.core.uri.RelativeURI;
-import org.eclipse.wst.command.env.core.uri.URI;
-import org.eclipse.wst.command.env.core.uri.URIException;
-import org.eclipse.wst.command.env.core.uri.URIScheme;
-
-
-public class EclipseScheme implements URIScheme
-{
-  private BaseEclipseEnvironment  environment_;
-  private MessageUtils            msg_;
-  
-  public EclipseScheme( BaseEclipseEnvironment environment )
-  {
-    environment_ = environment;
-    msg_         = new MessageUtils( "org.eclipse.wst.command.env.common.environment", this );
-  }
-  
-  /**
-   */
-  public boolean isHierarchical()
-  {
-    return true;
-  }
-
-  /**
-   */
-  public boolean isValid(URI uri)
-  {
-    boolean result = true;
-    
-    if( uri == null ) return false;
-    
-    try
-    {
-      getPathFromPlatformURI( uri.toString() );
-    }
-    catch( URIException exc )
-    {
-      result = false;
-    }
-    
-    return result;
-  }
-
-  /**
-   */
-  public URI newURI(String uri) throws URIException
-  {
-    String newURI = null;
-    
-    if( uri.startsWith( "platform:/resource") )
-    {
-      // The platform has been specified so keep it as is.
-      newURI = uri;
-    }
-    else if( uri.indexOf( ":") != -1 )
-    {
-      // The platform uri is not allowed to contain some other protocol. 
-      throw new URIException(
-          new SimpleStatus( "EclipseScheme",
-              msg_.getMessage("MSG_INVALID_PLATFORM_URL", new Object[]{uri}),
-              Status.ERROR ) );
-     }
-    else if( uri.startsWith( "/") )
-    {
-      // The platform scheme has not been specified so we will add it.
-      newURI = "platform:/resource" + uri;
-    }
-    
-    if( newURI == null )
-    {
-      return new RelativeURI( uri );
-    }
-    else
-    {
-      return new EclipseURI( newURI, environment_ );
-    }
-  }
-
-  /**
-   */
-  public URI newURI(URI uri) throws URIException
-  {
-    return newURI( uri.toString() );
-  }
-
-  /**
-   */
-  public URI newURI(URL url) throws URIException
-  {
-    return newURI( url.toString() );
-  }
-
-  /**
-   */
-  public Status validate(URI uri)
-  {
-    Status status = null;
-    
-    try
-    {
-      getPathFromPlatformURI( uri.toString() );
-      status = new SimpleStatus( "" );
-    }
-    catch( URIException exc )
-    {
-      status = exc.getStatus(); 
-    }
-    
-    return status;
-  }
-  
-  /**
-   * Gets the "platform:/resource" IPath given a url
-   * 
-   */
-  public String getPathFromPlatformURI(String uri) throws URIException 
-  {
-    String resourceFile = null;
-    URL    url          = null;
-    
-    try
-    {
-      url = new URL( uri ); 
-    }
-    catch( MalformedURLException exc )
-    { 
-    }
-    
-    if( url == null )
-    {
-      throw new URIException(
-          new SimpleStatus( "EclipseScheme",
-              msg_.getMessage("MSG_INVALID_PLATFORM_URL", new Object[]{uri}),
-              Status.ERROR ) );
-    }
-    if( url.getProtocol().equals("platform") ) 
-    {
-      String resourceURL = url.getFile();
-      
-      if (resourceURL.startsWith("/resource")) 
-      {
-        resourceFile = resourceURL.substring(10);   // omit the "/resource" portion
-      }
-    }
-    else 
-    {
-      throw new URIException(
-          new SimpleStatus( "EclipseScheme",
-                            msg_.getMessage("MSG_INVALID_PLATFORM_URL", new Object[]{url.getFile()}),
-							Status.ERROR ) );
-    }
-    
-    return resourceFile;
-  }
-  
-  /**
-   * 
-   * @param absolutePath an absolute IPath
-   * @return returns the platform URI for this path.
-   */
-  public String getURLFromPath( IPath absolutePath )
-  {
-    return "platform:/resource" + absolutePath;
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/env/eclipse/EclipseURI.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/env/eclipse/EclipseURI.java
deleted file mode 100644
index 359fe83..0000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/env/eclipse/EclipseURI.java
+++ /dev/null
@@ -1,495 +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.env.eclipse;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-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.wst.command.env.common.FileResourceUtils;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.command.env.core.uri.RelativeURI;
-import org.eclipse.wst.command.env.core.uri.URI;
-import org.eclipse.wst.command.env.core.uri.URIException;
-import org.eclipse.wst.command.env.core.uri.URIFilter;
-import org.eclipse.wst.command.env.core.uri.URIScheme;
-
-
-public class EclipseURI extends RelativeURI
-{
-  private BaseEclipseEnvironment environment_;
-  private EclipseScheme          scheme_;
-  private MessageUtils           msg_;
-  private File                   file_;
-  
-  public EclipseURI( String uri, BaseEclipseEnvironment environment )
-  {
-    super( uri );
-    
-    environment_  = environment;
-    scheme_       = new EclipseScheme( environment );
-    msg_          = new MessageUtils( "org.eclipse.wst.command.env.common.environment", this );
-    file_         = getFile();
-  }
-    
-  /**
-   * @see org.eclipse.env.uri.URI#erase()
-   */
-  public void erase() throws URIException
-  {
-    try 
-    {
-      IResource file = getResource();
-      
-      if( file != null && file.exists() ) 
-      {
-        if( file instanceof IFile )
-        {
-          FileResourceUtils.deleteFile( environment_.getResourceContext(),
-                                        (IFile)file,
-                                        environment_.getProgressMonitor(),
-                                        environment_.getStatusHandler() );
-        }
-        else if( file instanceof IFolder )
-        {
-          FileResourceUtils.deleteFolder( environment_.getResourceContext(),
-                                          (IFolder)file,
-                                          environment_.getProgressMonitor(),
-                                          environment_.getStatusHandler() );          
-        }
-      }
-      
-    }
-    catch( Exception exc ) 
-    {      
-      throw new URIException(
-          new SimpleStatus( "EclipseURI",
-                            exc.getMessage(),
-		                    Status.ERROR,
-			                exc ), 
-          this );
-    }
-  }
-
-  /**
-   * @see org.eclipse.env.uri.URI#getInputStream()
-   */
-  public InputStream getInputStream() throws URIException
-  {
-    try 
-    {
-      // If a class cast exception is throw it will be propogated as
-      // a URIException.
-      IFile file = (IFile)getResource();
-
-      //call getContents on the eclipse File object
-      if( file != null ) 
-      {
-        return file.getContents();
-      }
-    }
-    catch( Throwable exc ) 
-    {
-      throw new URIException(
-          new SimpleStatus( "EclipseURI",
-                            exc.getMessage(),
-							Status.ERROR,
-							exc ),
-          this );
-    }
-    
-    return null;
-  }
-
-  /**
-   * @see org.eclipse.env.uri.URI#getOutputStream()
-   */
-  public OutputStream getOutputStream() throws URIException
-  {
-    // Ensure that the parent folder exists.
-    URI parent = parent();
-    
-    if( !parent.isPresent() )
-    {
-      parent().touchFolder();
-    }
-    
-    return getOutStream();
-  }
-
-  /**
-   * @see org.eclipse.env.uri.URI#getURIScheme()
-   */
-  public URIScheme getURIScheme()
-  {
-    return scheme_;
-  }
-
-  /**
-   * @see org.eclipse.env.uri.URI#isLeaf()
-   */
-  public boolean isLeaf()
-  {
-    boolean result = false;
-  
-    try
-    {
-      IResource resource = getResource();
-      
-      if( resource != null && 
-          resource.exists() && 
-          resource.getType() == IResource.FILE )
-      {  
-        result = true;
-      }
-    }
-    catch( URIException exc )
-    {
-      // This URI does not exist.
-      result = false;
-    }
-   
-    return result;
-  }
-
-  /**
-   * @see org.eclipse.env.uri.URI#isPresent()
-   */
-  public boolean isPresent()
-  {
-    boolean result = false;
-    
-    try
-    {
-      IResource resource = getResource();
-      
-      if( resource != null && resource.exists() )
-       {  
-        result = true;
-      }
-    }
-    catch( URIException exc )
-    {
-      // This URI does not exist.
-      result = false;
-    }
-    
-    return result;
-  }
-
-  /**
-   * @see org.eclipse.env.uri.URI#isReadable()
-   */
-  public boolean isReadable()
-  {
-    boolean result = false;
-    
-    try
-    {
-      IResource resource = getResource();
-      
-      if( resource != null && resource.isAccessible() )
-       {  
-        result = true;
-      }
-    }
-    catch( URIException exc )
-    {
-      // This URI does not exist.
-      result = false;
-    }
-    
-    return result;
-   }
-
-  /**
-   * @see org.eclipse.env.uri.URI#isRelative()
-   */
-  public boolean isRelative()
-  { 
-    return false;
-  }
-
-  /**
-   * @see org.eclipse.env.uri.URI#isWritable()
-   */
-  public boolean isWritable()
-  {
-    boolean result = false;
-    
-    try
-    {
-      IResource resource = getResource();
-      
-      if( resource != null && 
-          resource.isAccessible() && 
-          !resource.getResourceAttributes().isReadOnly() )
-       {  
-        result = true;
-      }
-    }
-    catch( URIException exc )
-    {
-      // This URI does not exist.
-      result = false;
-    }
-    
-    return result;
-  }
-
-  /**
-   * @see org.eclipse.env.uri.URI#list()
-   */
-  public URI[] list() throws URIException
-  {
-    IResource resource    = getResource();
-    URI[]     uriChildren = new URI[0];
-    
-    if( resource.getType() == IResource.FOLDER )
-    {
-      IFolder     folder   = (IFolder)resource;
-      
-      try
-      {
-        IResource[] children    = folder.members();  
-  
-        uriChildren = new URI[children.length];
-        
-        for( int index = 0; index < children.length; index++ )
-        {
-          IPath path = children[index].getFullPath();
-          uriChildren[index] = new EclipseURI( scheme_.getURLFromPath(path), environment_ );
-        }
-      }
-      catch( CoreException exc )
-      {
-      }
-    }
-    
-    return uriChildren;
-  }
-
-  /**
-   * @see org.eclipse.env.uri.URI#list(org.eclipse.env.uri.URIFilter)
-   */
-  public URI[] list(URIFilter uriFilter) throws URIException
-  {
-    IResource resource = getResource();
-    URI[]     result   = new URI[0];
-    
-    if( resource.getType() == IResource.FOLDER )
-     {
-      IFolder     folder   = (IFolder)resource;
-      
-      try
-      {
-        IResource[] children    = folder.members();       
-        Vector      uriChildren = new Vector();
-        
-        for( int index = 0; index < children.length; index++ )
-         {
-          IPath path = children[index].getFullPath();
-          URI   uri  = new EclipseURI( scheme_.getURLFromPath(path), environment_ );
-          
-          if( uriFilter.accepts( uri ) )
-          {
-            uriChildren.add( uri );
-          }
-        }
-        
-        result = (URI[])uriChildren.toArray( new URI[0] );
-      }
-      catch( CoreException exc )
-      {
-      }
-    }
-    
-    return result;
-  }
-   
-  /**
-   * @see org.eclipse.env.uri.URI#rename(org.eclipse.env.uri.URI)
-   */
-  public void rename(URI newURI )
-  {
-    // TODO Auto-generated method stub
-
-  }
-
-  /**
-   * @see org.eclipse.env.uri.URI#touchFolder()
-   */
-  public void touchFolder() throws URIException
-  {
-    IResource resource = getResource();
-    
-    if( resource != null )
-    { 
-      if( resource.getType() == IResource.FOLDER )
-      {
-        IFolder folder = (IFolder)resource;
-        
-        try
-        {
-          if( folder.members().length > 0 )
-          {
-            throw new URIException( 
-                new SimpleStatus( "EclipseURI",
-                    msg_.getMessage( "MSG_ERROR_FOLDER_HAS_CHILDREN", new Object[]{ folder.toString() } ),
-                    Status.ERROR ),
-                this );
-								
-          }
-        }
-        catch( CoreException exc )
-        {        
-          throw new URIException( 
-              new SimpleStatus( "EclipseURI",
-                  exc.getMessage(),
-                  Status.ERROR,
-				  exc ),
-              this );
-        }
-      }
-      else
-      {
-         //??? Not sure what to do if touching a folder and the URI exists and it is not a folder.
-      }
-    }
-    else
-    {
-      IPath newPath = new Path( scheme_.getPathFromPlatformURI( uri_ ) ).makeAbsolute();
-      
-      try
-      {
-        FileResourceUtils.makeFolderPath( environment_.getResourceContext(), 
-                                      newPath,
-                                      environment_.getProgressMonitor(),
-			  	                      environment_.getStatusHandler() );
-      }
-      catch( CoreException exc )
-      {
-        throw new URIException( 
-            new SimpleStatus( "EclipseURI",
-                exc.getMessage(),
-                Status.ERROR,
-								exc ),
-            this );
-        
-      }
-    }
-  }
-
-  /**
-   * @see org.eclipse.env.uri.URI#touchLeaf()
-   */
-  public void touchLeaf() throws URIException
-  {
-    IResource resource = getResource();
-    
-    if( resource != null )
-    {
-      // The resource already exists so do nothing.
-    }    
-    else
-    {
-      // Get the parent for this leaf and create it if required.
-      URI parent = parent();
-      
-      if( !parent.isPresent() )
-      {  
-        parent().touchFolder();
-      }
-      
-      try
-      {
-        // Get an output stream to the specified file and immediately close it.
-        // This should create a 0 byte file.
-        getOutStream().close();
-      }
-      catch( IOException exc )
-      {
-        throw new URIException( new SimpleStatus( "EclipseURI", 
-                                                  exc.getMessage(), 
-                                                  Status.ERROR,
-											      exc ),
-                                this ); 
-      }
-    }
-
-  }
-
-  private IResource getResource() throws URIException
-  {    
-    IPath  path             = new Path( scheme_.getPathFromPlatformURI(uri_) );
-    String absolutePathname = path.makeAbsolute().toString();
-   
-    return FileResourceUtils.findResource(absolutePathname);
-  }
-  
-  /**
-   * @see org.eclipse.env.uri.URI#getOutputStream()
-   */
-  private OutputStream getOutStream() throws URIException
-  {
-    IPath        file   = new Path( scheme_.getPathFromPlatformURI( uri_ ) ).makeAbsolute();
-    OutputStream stream = null;
-    
-    stream = FileResourceUtils.newFileOutputStream ( environment_.getResourceContext(),
-                                                 file,
-                                                 environment_.getProgressMonitor(),
- 			                                     environment_.getStatusHandler() );    
-    return stream;
-  }
-  
-  /**
-   * Returns a File object for the resource under this URI.
-   * There are many URIs and URISchemes for which this method
-   * will fail and throw an exception. It should be used only
-   * in cases where URIs are known to be backed by physical files.
-   */
-  public File asFile ()
-  {
-  	return file_;
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.core.uri.URI#isAvailableAsFile()
-   */
-  public boolean isAvailableAsFile() 
-  {
-  	return file_ != null;
-  }
-  
-  private File getFile()
-  {
-    String platformRes = "platform:/resource";
-    File   result      = null;
-    
-    if (uri_.startsWith(platformRes))
-    {
-      result = new File(ResourcesPlugin.getWorkspace().getRoot().getLocation().removeTrailingSeparator().append(uri_.substring(platformRes.length(), uri_.length())).toString());
-    }
-    
-    return result;
-  }
-}
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 577bd0e..0000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/commandline/CommandLine.java
+++ /dev/null
@@ -1,856 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.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/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 9ada4f3..0000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/context/ActionDialogPreferenceTypeRegistry.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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 0e22a4a..0000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/context/PersistentActionDialogsContext.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.command.internal.env.context;
-
-import org.eclipse.wst.command.env.context.PersistentContext;
-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/PersistentResourceContext.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/context/PersistentResourceContext.java
deleted file mode 100644
index dc494f5..0000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/context/PersistentResourceContext.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.command.internal.env.context;
-
-import org.eclipse.wst.command.env.context.PersistentContext;
-import org.eclipse.wst.command.env.core.context.ResourceContext;
-import org.eclipse.wst.command.env.core.context.ResourceDefaults;
-import org.eclipse.wst.command.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/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 065ac06..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.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<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 efc1e93..0000000
--- a/bundles/org.eclipse.wst.ws.parser/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-.cdtproject
-build.xml
-temp.folder
-parser.jar
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/build.properties b/bundles/org.eclipse.wst.ws.parser/build.properties
deleted file mode 100644
index 5e76599..0000000
--- a/bundles/org.eclipse.wst.ws.parser/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-bin.includes = plugin.xml,\
-               parser.jar
-source.parser.jar = src/
-output.parser.jar = bin/
-src.includes = plugin.xml,\
-               src/,\
-               build.properties
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 267963d..0000000
--- a/bundles/org.eclipse.wst.ws.parser/plugin.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin
-   id="org.eclipse.wst.ws.parser"
-   version="1.0.0"
-   name="%PLUGIN_NAME"
-   provider-name="%PLUGIN_PROVIDER"
-   class="org.eclipse.wst.ws.parser.ParserPlugin">
-
-   <runtime>
-      <library name="parser.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-
-   <requires>
-      <import plugin="org.eclipse.wst.wsdl"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.apache.wsil4j"/>
-      <import plugin="org.uddi4j"/>
-      <import plugin="org.apache.axis11"/>
-      <import plugin="org.wsdl4j"/>
-   </requires>
-
-</plugin>
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/parser/ParserPlugin.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/parser/ParserPlugin.java
deleted file mode 100644
index 81c7236..0000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/parser/ParserPlugin.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.ws.parser;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.runtime.Plugin;
-
-/**
- * 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;
-	}
-}
diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/parser/disco/DISCOContractReference.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/parser/disco/DISCOContractReference.java
deleted file mode 100644
index 2e4b713..0000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/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.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/parser/disco/DISCOParser.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/parser/disco/DISCOParser.java
deleted file mode 100644
index f5f3cb0..0000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/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.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/parser/disco/DISCOReference.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/parser/disco/DISCOReference.java
deleted file mode 100644
index 3c13bba..0000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/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.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/parser/discovery/NetUtils.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/parser/discovery/NetUtils.java
deleted file mode 100644
index 27bc5ca..0000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/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.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/parser/discovery/WebServicesParserExt.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/parser/discovery/WebServicesParserExt.java
deleted file mode 100644
index 37a972e..0000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/parser/discovery/WebServicesParserExt.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.ws.parser.discovery;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import org.eclipse.wst.ws.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/parser/favorites/FavoritesConstants.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/parser/favorites/FavoritesConstants.java
deleted file mode 100644
index bcb5a55..0000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/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.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/parser/favorites/FavoritesLink.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/parser/favorites/FavoritesLink.java
deleted file mode 100644
index 128f10d..0000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/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.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/parser/favorites/FavoritesRegistryTypeAbstract.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/parser/favorites/FavoritesRegistryTypeAbstract.java
deleted file mode 100644
index 7f9268c..0000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/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.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/parser/favorites/FavoritesService.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/parser/favorites/FavoritesService.java
deleted file mode 100644
index 63a246b..0000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/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.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/parser/favorites/FavoritesUDDIBusiness.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/parser/favorites/FavoritesUDDIBusiness.java
deleted file mode 100644
index 5df8175..0000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/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.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/parser/favorites/FavoritesUDDIRegistry.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/parser/favorites/FavoritesUDDIRegistry.java
deleted file mode 100644
index 459a33e..0000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/parser/favorites/FavoritesUDDIRegistry.java
+++ /dev/null
@@ -1,80 +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.parser.favorites;
-
-import org.apache.wsil.Abstract;
-
-public class FavoritesUDDIRegistry extends FavoritesLink implements IFavoritesUDDIRegistry
-{
-  public FavoritesUDDIRegistry()
-  {
-    super();
-  }
-
-  public String getName()
-  {
-    return (link_.getAbstracts())[0].getText();
-  }
-
-  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/parser/favorites/FavoritesUDDIService.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/parser/favorites/FavoritesUDDIService.java
deleted file mode 100644
index 9aae28b..0000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/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.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/parser/favorites/FavoritesUDDIServiceInterface.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/parser/favorites/FavoritesUDDIServiceInterface.java
deleted file mode 100644
index 0c3cc2a..0000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/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.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/parser/favorites/FavoritesWSDL.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/parser/favorites/FavoritesWSDL.java
deleted file mode 100644
index 046d751..0000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/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.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/parser/favorites/FavoritesWSIL.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/parser/favorites/FavoritesWSIL.java
deleted file mode 100644
index b66f312..0000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/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.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/parser/favorites/IFavoritesRegistryType.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/parser/favorites/IFavoritesRegistryType.java
deleted file mode 100644
index 13e7e1d..0000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/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.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/parser/favorites/IFavoritesUDDIBusiness.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/parser/favorites/IFavoritesUDDIBusiness.java
deleted file mode 100644
index 0f63d09..0000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/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.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/parser/favorites/IFavoritesUDDIRegistry.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/parser/favorites/IFavoritesUDDIRegistry.java
deleted file mode 100644
index 3acd516..0000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/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.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/parser/favorites/IFavoritesUDDIService.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/parser/favorites/IFavoritesUDDIService.java
deleted file mode 100644
index c26a9f6..0000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/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.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/parser/favorites/IFavoritesUDDIServiceInterface.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/parser/favorites/IFavoritesUDDIServiceInterface.java
deleted file mode 100644
index ead7c13..0000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/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.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/parser/favorites/IFavoritesWSDL.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/parser/favorites/IFavoritesWSDL.java
deleted file mode 100644
index 832bcf3..0000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/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.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/parser/favorites/IFavoritesWSIL.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/parser/favorites/IFavoritesWSIL.java
deleted file mode 100644
index 90ef394..0000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/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.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/parser/wsil/HTMLHeadHandler.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/parser/wsil/HTMLHeadHandler.java
deleted file mode 100644
index 98ef2b9..0000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/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.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/parser/wsil/IllegalArgumentsException.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/parser/wsil/IllegalArgumentsException.java
deleted file mode 100644
index 4a3cf0f..0000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/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.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/parser/wsil/UDDIURIHelper.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/parser/wsil/UDDIURIHelper.java
deleted file mode 100644
index 05b21fd..0000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/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.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/parser/wsil/WWWAuthenticationException.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/parser/wsil/WWWAuthenticationException.java
deleted file mode 100644
index 723a361..0000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/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.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/parser/wsil/WWWAuthenticationHandler.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/parser/wsil/WWWAuthenticationHandler.java
deleted file mode 100644
index 86ddc42..0000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/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.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/parser/wsil/WebServiceEntity.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/parser/wsil/WebServiceEntity.java
deleted file mode 100644
index 776bd2a..0000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/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.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/parser/wsil/WebServicesParser.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/parser/wsil/WebServicesParser.java
deleted file mode 100644
index cd0f440..0000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/parser/wsil/WebServicesParser.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.ws.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.parser.disco.DISCOContractReference;
-import org.eclipse.wst.ws.parser.disco.DISCOParser;
-import org.eclipse.wst.ws.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 byte[] getBytes(WebServiceEntity wsEntity) throws MalformedURLException, IOException, WWWAuthenticationException
-  {
-    byte[] b = wsEntity.getBytes();
-    if (b == null)
-    {
-      b = getInputStreamAsByteArray(wsEntity.getURI());
-      wsEntity.setBytes(b);
-      setHTTPSettings(wsEntity);
-    }
-    return b;
-  }
-
-  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/parser/wsil/wsil.properties b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/parser/wsil/wsil.properties
deleted file mode 100644
index 1e60c01..0000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/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.ui/.classpath b/bundles/org.eclipse.wst.ws.ui/.classpath
deleted file mode 100644
index 065ac06..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.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<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 9597d10..0000000
--- a/bundles/org.eclipse.wst.ws.ui/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-temp.folder
-build.xml
-wsui.jar
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/build.properties b/bundles/org.eclipse.wst.ws.ui/build.properties
deleted file mode 100644
index 16a3451..0000000
--- a/bundles/org.eclipse.wst.ws.ui/build.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-source.wsui.jar = src/
-output.wsui.jar = bin/
-bin.includes = plugin.xml,\
-               wsui.jar,\
-               plugin.properties
-src.includes = src/,\
-               plugin.xml,\
-               plugin.properties,\
-               build.properties
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 fe083d4..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=WS-I Compliance
\ 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 1793258..0000000
--- a/bundles/org.eclipse.wst.ws.ui/plugin.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.wst.ws.ui"
-   name="%PLUGIN_NAME"
-   version="1.0.0"
-   provider-name="%PLUGIN_PROVIDER"
-   class="org.eclipse.wst.ws.internal.ui.plugin.WSUIPlugin">
-
-   <runtime>
-      <library name="wsui.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-
-   <requires>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.jdt.core"/>
-      <import plugin="org.eclipse.wst.command.env.core"/>
-      <import plugin="org.eclipse.wst.command.env"/>
-      <import plugin="org.eclipse.wst.command.env.ui"/>
-      <import plugin="org.eclipse.wst.ws"/>
-   </requires>
-
-	<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">
-         <filter
-               name="nature"
-               value="org.eclipse.jdt.core.javanature">
-         </filter>
-      </page>
-      
-      <page
-            objectClass="org.eclipse.jdt.core.IJavaProject"
-            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">
-         <filter
-               name="nature"
-               value="org.eclipse.jdt.core.javanature">
-         </filter>
-      </page>
-
-   </extension>
-</plugin>
diff --git a/bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/internal/provisional/ui/wsrt/IObjectSelector.java b/bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/internal/provisional/ui/wsrt/IObjectSelector.java
deleted file mode 100644
index e8c6a7b..0000000
--- a/bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/internal/provisional/ui/wsrt/IObjectSelector.java
+++ /dev/null
@@ -1,29 +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.provisional.ui.wsrt;
-
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Listener;
-
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.command.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.ws.internal.provisional.wsrt.ISelection;
-
-public interface IObjectSelector {
-	
-	public void setInitialSelection(ISelection sel);
-	public ISelection getSelection();
-	public String getProject();
-	public Status validateSelection(ISelection sel);
-	public WidgetDataEvents addControls(Composite parent, Listener statusListener);
-
-}
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 b471bbc..0000000
--- a/bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/internal/ui/plugin/WSUIPlugin.java
+++ /dev/null
@@ -1,177 +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.core.runtime.Platform;
-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.env.core.common.Log;
-import org.eclipse.wst.command.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_;
- private Log log_;
- 
- /**
-  * 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;
-   }
- }
-
- public String getPluginStateLocation() {
-   return Platform.getPluginStateLocation(this).toOSString();
- }
-
- public String getPluginInstallLocation() {
-   try {
-     return Platform.resolve(getBundle().getEntry("/")).getFile();
-		} catch (Exception 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 2f7bd36..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.env.context.PersistentContext;
-import org.eclipse.wst.command.env.core.common.Log;
-import org.eclipse.wst.command.env.eclipse.EclipseLog;
-
-
-
-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");
-    	Log log = new EclipseLog();
-    	log.log(Log.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 da12012..0000000
--- a/bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/internal/ui/wsi/preferences/WSICompliancePreferencePage.java
+++ /dev/null
@@ -1,264 +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.wst.ws.internal.ui.plugin.WSUIPlugin;
-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.Label;
-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.env.core.common.MessageUtils;
-
-
-
-public class WSICompliancePreferencePage extends PreferencePage implements IWorkbenchPreferencePage, 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 PWSI0001 for the stop WS-I SSBP Non compliance Preference Page*/
-  private String INFOPOP_PWSI_SSBP_COMBO_STOP_NON_WSI = WSUIPlugin.ID + ".PWSI0001";
-  /*CONTEXT_ID PWSI0002 for the warn WS-I SSBP Non compliance Preference Page*/
-  private String INFOPOP_PWSI_SSBP_COMBO_WARN_NON_WSI = WSUIPlugin.ID + ".PWSI0002";
-  /*CONTEXT_ID PWSI0003 for the ignore WS-I SSBP Non compliance Preference Page*/
-  private String INFOPOP_PWSI_SSBP_COMBO_IGNORE_NON_WSI = WSUIPlugin.ID + ".PWSI0003";
-  /*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";
-  
-  private Label wsi_ap_Label_;
-  private Combo wsi_ap_Types_;
-  
-  /*CONTEXT_ID PWSI0005 for the stop WS-I AP Non compliance Preference Page*/
-  private String INFOPOP_PWSI_AP_COMBO_STOP_NON_WSI = WSUIPlugin.ID + ".PWSI0005";
-  /*CONTEXT_ID PWSI0006 for the warn WS-I AP Non compliance Preference Page*/
-  private String INFOPOP_PWSI_AP_COMBO_WARN_NON_WSI = WSUIPlugin.ID + ".PWSI0006";
-  /*CONTEXT_ID PWSI0007 for the ignore WS-I AP Non compliance Preference Page*/
-  private String INFOPOP_PWSI_AP_COMBO_IGNORE_NON_WSI = WSUIPlugin.ID + ".PWSI0007";
-  /*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 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_.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"));
-  
-    initializeValues();
-    org.eclipse.jface.dialogs.Dialog.applyDialogFont(superparent);    
-    return parent;
-  }
-
-  private Button createRadioButton( Composite parent, String text )
-  {
-    Button button = new Button( parent, SWT.RADIO );
-    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()
-  {
-    // 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);
-
-  }
-
-  /**
-   * 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)
-  {
-    
-    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) {
-	
-  }
-  
-}
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 0e6dc9a..0000000
--- a/bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/internal/ui/wsi/preferences/WSIComplianceUtils.java
+++ /dev/null
@@ -1,117 +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.wst.ws.internal.ui.plugin.WSUIPlugin;
-import org.eclipse.wst.command.env.core.common.Choice;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.command.env.core.common.StatusHandler;
-
-
-public class WSIComplianceUtils
-{
-private static final int IGNORE_ID =0;
-private static final int IGNORE_ALL_ID =1;
-private static final int CANCEL_ID =2;
-
-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 ( StatusHandler monitor, Status[] status, IProject project, PersistentWSIContext context) instead
- * @param monitor StatusHandler
- * @param status Status[]
- * @param project IProject
- * @return boolean true if to continue
- */
-public static boolean checkWSICompliance ( StatusHandler monitor, Status[] status, IProject project)
-{	// check for SSBP by default
-	return checkWSICompliance ( monitor, status, project, WSUIPlugin.getInstance().getWSISSBPContext());
-}
-/**
- * @param monitor StatusHandler
- * @param status Status[]
- * @param project IProject
- * @param context PersistentWSIContext
- * @return boolean true if to continue
- */
-public static boolean checkWSICompliance ( StatusHandler 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
-  			SimpleStatus status_ = new SimpleStatus(WSUIPlugin.ID, msgUtils_.getMessage(context.getError()), Status.ERROR);
-  			// adding all messages from WSI Incompliances
-  			for (int i = 0; i< status.length; i++)
-	  			status_.addChild(status[i]); 			
-			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
-  			SimpleStatus status_ = new SimpleStatus(WSUIPlugin.ID, msgUtils_.getMessage(context.getWarning()), Status.WARNING);
-  			// adding all messages from WSI Incompliances
-  			for (int i = 0; i< status.length; i++)
-	  			status_.addChild(status[i]);
-
-  			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 6cb833d..0000000
--- a/bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/internal/ui/wsi/properties/WSICompliancePropertyPage.java
+++ /dev/null
@@ -1,277 +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.wst.ws.internal.ui.plugin.WSUIPlugin;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-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.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.PropertyPage;
-import org.eclipse.ui.help.IWorkbenchHelpSystem;
-import org.eclipse.wst.command.env.core.common.MessageUtils;
-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 PWSI0001 for the stop WS-I SSBP Non compliance Preference Page*/
-  private String INFOPOP_PWSI_SSBP_COMBO_STOP_NON_WSI = WSUIPlugin.ID + ".PWSI0001";
-  /*CONTEXT_ID PWSI0002 for the warn WS-I SSBP Non compliance Preference Page*/
-  private String INFOPOP_PWSI_SSBP_COMBO_WARN_NON_WSI = WSUIPlugin.ID + ".PWSI0002";
-  /*CONTEXT_ID PWSI0003 for the ignore WS-I SSBP Non compliance Preference Page*/
-  private String INFOPOP_PWSI_SSBP_COMBO_IGNORE_NON_WSI = WSUIPlugin.ID + ".PWSI0003";
-  /*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";
-  
-  private Label wsi_ap_Label_;
-  private Combo wsi_ap_Types_;
-  
-  /*CONTEXT_ID PWSI0005 for the stop WS-I AP Non compliance Preference Page*/
-  private String INFOPOP_PWSI_AP_COMBO_STOP_NON_WSI = WSUIPlugin.ID + ".PWSI0005";
-  /*CONTEXT_ID PWSI0006 for the warn WS-I AP Non compliance Preference Page*/
-  private String INFOPOP_PWSI_AP_COMBO_WARN_NON_WSI = WSUIPlugin.ID + ".PWSI0006";
-  /*CONTEXT_ID PWSI0007 for the ignore WS-I AP Non compliance Preference Page*/
-  private String INFOPOP_PWSI_AP_COMBO_IGNORE_NON_WSI = WSUIPlugin.ID + ".PWSI0007";
-  /*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";
-  
-  /*CONTEXT_ID PWSI0009 for the WS-I follow preference radio button the WS-I SSBP compliance project property Page*/
-  private String INFOPOPP_PWSI_RADIO_FOLLOW_WSI_SSBP_PREFERENCE = WSUIPlugin.ID + ".PWSI0009";
-  /*CONTEXT_ID PWSI0010 for the WS-I follow preference radio button the WS-I AP compliance project property Page*/
-  private String INFOPOPP_PWSI_RADIO_FOLLOW_WSI_AP_PREFERENCE = WSUIPlugin.ID + ".PWSI0010";
-
-  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;
-  }
- 
-  private String getMessage(String key) 
-  {
-  		return WSUIPlugin.getMessage(key);
-  }
-
-  private Button createRadioButton( Composite parent, String text )
-  {
-    Button button = new Button( parent, SWT.RADIO );
-    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 IWorkbenchPropertyPage
-   */
-  public void init(IWorkbench workbench)   { 
-  }
-
-  /**
-   * 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/ui/plugin.properties b/bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/ui/plugin.properties
deleted file mode 100644
index cf347c7..0000000
--- a/bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/ui/plugin.properties
+++ /dev/null
@@ -1,75 +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
-
-
-
-
-
-
-
-
diff --git a/bundles/org.eclipse.wst.ws/.classpath b/bundles/org.eclipse.wst.ws/.classpath
deleted file mode 100644
index 065ac06..0000000
--- a/bundles/org.eclipse.wst.ws/.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.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.wst.ws/.cvsignore b/bundles/org.eclipse.wst.ws/.cvsignore
deleted file mode 100644
index 864f1b3..0000000
--- a/bundles/org.eclipse.wst.ws/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-temp.folder
-build.xml
-ws.jar
diff --git a/bundles/org.eclipse.wst.ws/.project b/bundles/org.eclipse.wst.ws/.project
deleted file mode 100644
index 2494e2f..0000000
--- a/bundles/org.eclipse.wst.ws/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.ws</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/build.properties b/bundles/org.eclipse.wst.ws/build.properties
deleted file mode 100644
index ac518e3..0000000
--- a/bundles/org.eclipse.wst.ws/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-source.ws.jar = src/
-output.ws.jar = bin/
-bin.includes = plugin.xml,\
-               ws.jar
diff --git a/bundles/org.eclipse.wst.ws/component.xml b/bundles/org.eclipse.wst.ws/component.xml
deleted file mode 100644
index a191762..0000000
--- a/bundles/org.eclipse.wst.ws/component.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component xmlns="http://eclipse.org/wtp/releng/tools/component-model" name="org.eclipse.wst.ws">
-   <component-depends unrestricted="true">
-   </component-depends>
-   <plugin id="org.eclipse.wst.ws.apache.axis" fragment="false"/>
-   <plugin id="org.eclipse.wst.ws.apache.soap" fragment="false"/>
-   <plugin id="org.eclipse.wst.ws.apache.wsil" fragment="false"/>
-   <plugin id="org.eclipse.wst.ws" fragment="false"/>
-   <plugin id="org.eclipse.wst.ws.parser" fragment="false"/>
-   <plugin id="org.eclipse.wst.ws.uddi4j" fragment="false"/>
-   <plugin id="org.eclipse.wst.ws.ui" fragment="false"/>
-</component>
diff --git a/bundles/org.eclipse.wst.ws/plugin.properties b/bundles/org.eclipse.wst.ws/plugin.properties
deleted file mode 100644
index 2572d91..0000000
--- a/bundles/org.eclipse.wst.ws/plugin.properties
+++ /dev/null
@@ -1,28 +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
-PLUGIN_PROVIDER=Eclipse.org
-
-MSG_ERROR_UNABLE_TO_START_MONITOR=IWAB0001E Unable to monitor port {0} of {1}.
-
-# Currently known public UDDI registries
-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
diff --git a/bundles/org.eclipse.wst.ws/plugin.xml b/bundles/org.eclipse.wst.ws/plugin.xml
deleted file mode 100644
index eaedc9a..0000000
--- a/bundles/org.eclipse.wst.ws/plugin.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin
-   id="org.eclipse.wst.ws"
-   version="1.0.0"
-   name="%PLUGIN_NAME"
-   provider-name="%PLUGIN_PROVIDER"
-   class="org.eclipse.wst.ws.WSPlugin">
-
-   <runtime>
-      <library name="ws.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-
-   <requires>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.wst.internet.monitor.core"/>
-      <import plugin="org.eclipse.wst.server.core"/>
-      <import plugin="org.eclipse.wst.command.env.core"/>
-      <import plugin="org.eclipse.wst.wsdl"/>
-      <import plugin="org.eclipse.wst.ws.parser"/>
-      <import plugin="org.eclipse.wst.command.env"/>
-      <import plugin="org.eclipse.emf.common"/>
-      <import plugin="org.wsdl4j"/>
-      <import plugin="org.apache.wsil4j"/>
-   </requires>
-
-</plugin>
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/WSPlugin.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/WSPlugin.java
deleted file mode 100644
index 9ec0f70..0000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/WSPlugin.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package org.eclipse.wst.ws;
-
-import java.text.MessageFormat;
-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 WSPlugin extends Plugin {
-
-	// The shared instance.
-	private static WSPlugin plugin;
-
-	// Resource bundle.
-	private ResourceBundle resourceBundle;
-
-	/**
-	 * The constructor.
-	 */
-	public WSPlugin() {
-		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 WSPlugin 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 = WSPlugin.getDefault().getResourceBundle();
-		try {
-			return (bundle != null) ? bundle.getString(key) : key;
-		} catch (MissingResourceException e) {
-			return key;
-		}
-	}
-
-	/**
-	 * Returns the string from the plugin's resource bundle, or 'key' if not
-	 * found. Replaces substitution variables in the message by objects in 'args'.
-	 */
-	public static String getResourceString(String key, Object[] args) {
-		return MessageFormat.format(getResourceString(key), args);
-	}
-
-	/**
-	 * Returns the plugin's resource bundle,
-	 */
-	public ResourceBundle getResourceBundle() {
-		try {
-			if (resourceBundle == null)
-				resourceBundle = ResourceBundle
-						.getBundle("org.eclipse.wst.ws.WSPluginResources");
-		} catch (MissingResourceException x) {
-			resourceBundle = null;
-		}
-		return resourceBundle;
-	}
-}
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/BasicConnection.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/BasicConnection.java
deleted file mode 100644
index 538caa2..0000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/BasicConnection.java
+++ /dev/null
@@ -1,63 +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.wst.ws.internal.datamodel;
-
-public class BasicConnection implements Connection
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  private Rel fRel;
-  private Element fElement;
-  private Connection fOpposingConnection;
-
-  public static final int OUTBOUND = 0;
-  public static final int INBOUND = 1;
-
-  public static Connection[] createPair ( Rel outboundRel, Element targetElement, Rel inboundRel, Element sourceElement )
-  {
-    BasicConnection outboundConnection = new BasicConnection(outboundRel,targetElement);
-    BasicConnection inboundConnection = new BasicConnection(inboundRel,sourceElement);
-    outboundConnection.fOpposingConnection = inboundConnection;
-    inboundConnection.fOpposingConnection = outboundConnection;
-    return new Connection[] {outboundConnection,inboundConnection};
-  }
-
-  public BasicConnection ( Rel rel, Element element )
-  {
-    fRel = rel;
-    fElement = element;
-    fOpposingConnection = null;
-  }
-
-  public Rel getRel ()
-  {
-    return fRel;
-  }
-
-  public Element getElement ()
-  {
-    return fElement;
-  }
-
-  public Connection getOpposingConnection ()
-  {
-    return fOpposingConnection;
-  }
-
-  public String toString ()
-  {
-    return fElement.getName();
-  }
-}
-
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/BasicElement.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/BasicElement.java
deleted file mode 100644
index 72d08f0..0000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/BasicElement.java
+++ /dev/null
@@ -1,344 +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.wst.ws.internal.datamodel;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Vector;
-
-public class BasicElement implements Element
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  private String fName;
-  private String fMUID;
-  private Model fModel;
-  private Hashtable fRels;
-  private Hashtable fProperties;
-  private Vector fListeners;
-
-  public BasicElement ( String name, Model model )
-  {
-    fName = name;
-    setMUID(model.makeMUID(name));
-    model.addElement(this);
-    fModel = model;
-    fRels = new Hashtable();
-    fListeners = new Vector();
-    fProperties = new Hashtable();
-    fProperties.put(Property.NAME,new BasicProperty(Property.NAME,fName));
-  }
-
-  public BasicElement ( String name, Element element, String outboundRelName, String inboundRelName )
-  {
-    this(name,element.getModel());
-    connect(element,outboundRelName,inboundRelName);
-  }
-
-  /**
-  * Returns a clone of this <code>Element</code>
-  * of the same class and with the same name and model,
-  * but with no Properties, Rels or Listeners except for
-  * the {@link Property#NAME NAME} property.
-  * @return Object A new Element.
-  */
-  public Element shallowClone ()
-  {
-    return new BasicElement(fName,fModel);
-  }
-
-  /**
-  * Returns a clone of this <code>Element</code>
-  * of the same class and with the same name and model
-  * and with a copy of the original Element's Properties.
-  * The Rels and Listeners are not cloned.
-  * @return Element A new Element.
-  */
-  public final Element deepClone ()
-  {
-    Element newElement = shallowClone();
-    Enumeration e = getProperties();
-    while (e.hasMoreElements())
-    {
-      Property property = (Property)e.nextElement();
-      Property newProperty = (Property)property.shallowClone();
-      newElement.setProperty(newProperty);
-    }
-    return newElement;
-  }
-
-  /**
-  * Model-View-Controller: All property changes to the model
-  * (such as those made by a wizard in the role of a Controller)
-  * should yield events to which an interested party can listen
-  * (such as a wizard in the role of a Viewer).
-  * @param tml The listener to add.
-  */
-  public void addListener ( ElementListener listener )
-  {
-    fListeners.add(listener);
-  }
-
-  public Model getModel ()
-  {
-    return fModel;
-  }
-
-  public boolean isValid ()
-  {
-    return (fModel != null && fModel.containsElement(this));
-  }
-
-  public boolean remove ()
-  {
-    return fModel.removeElement(this);
-  }
-
-  public void setName ( String name )
-  {
-    fName = name;
-    fProperties.put(Property.NAME,new BasicProperty(Property.NAME,fName));
-  }
-
-  public String getName ()
-  {
-    return fName;
-  }
-
-  /*
-  * The getter for the MUID
-  * The MUID is the Model Unique Identifier, made from the name and an
-  * appended unique number 
-  * @return String a unique id for this element within the context of the model 
-  */
-  public String getMUID()
-  {
-    return fMUID;
-  }
-
-  /*
-  *
-  *
-  */
-  public int getNumberID()
-  {
-    String number = getMUID().substring(getName().length());  
-    return Integer.parseInt(number);
-  }
-
-  /*
-  * Set the MUID which was made by the model
-  * Should only be settable within this element
-  * Set once upon creation, you can change the name
-  * but the id will remain constant.
-  */
-  private void setMUID(String MUID)
-  {
-    fMUID = MUID;
-  }
- 
-  public void setProperty ( Property property )
-  {
-    String propertyName = property.getName();
-    Property oldProperty = getProperty(propertyName);
-    fProperties.put(propertyName,property);
-    if (oldProperty == null)
-    {
-      PropertyAddEvent event = new PropertyAddEvent(this,property);
-      Enumeration e = fListeners.elements();
-      while (e.hasMoreElements())
-      {
-        ((ElementListener)e.nextElement()).propertyAdded(event);
-      }
-    }
-    else
-    {
-      Object oldValue = oldProperty.getValue();
-      Object newValue = property.getValue();
-      if (oldValue != newValue)
-      {
-        if (oldValue == null || newValue == null || (!oldValue.equals(newValue)))
-        {
-          PropertyChangeEvent event = new PropertyChangeEvent(this,property,oldProperty);
-          Enumeration e = fListeners.elements();
-          while (e.hasMoreElements())
-          {
-            ((ElementListener)e.nextElement()).propertyChanged(event);
-          }
-        }
-      }
-    }
-    if (propertyName.equals(Property.NAME)) fName = property.getValue().toString();
-  }
-
-  public void setPropertyAsObject ( String name, Object value )
-  {
-    setProperty(new BasicProperty(name,value));
-  }
-
-  public void setPropertyAsString ( String name, String value )
-  {
-    setProperty(new BasicProperty(name,value));
-  }
-
-  public Property getProperty ( String name )
-  {
-    return (Property)fProperties.get(name);
-  }
-
-  public Object getPropertyAsObject ( String name )
-  {
-    Property property = getProperty(name);
-    return (property == null ? null : property.getValue());
-  }
-
-  public String getPropertyAsString ( String name )
-  {
-    Property property = getProperty(name);
-    return (property == null ? null : property.getValueAsString());
-  }
-
-  public Enumeration getProperties ()
-  {
-    return fProperties.elements();
-  }
-
-  public boolean connect ( Element targetElement, String outboundRelName, String inboundRelName )
-  {
-    if (fModel == null || fModel != targetElement.getModel()) return false;
-
-    Element sourceElement = this;
-    Rel outboundRel = sourceElement.getRel(outboundRelName);
-    Rel inboundRel = targetElement.getRel(inboundRelName);
-    Connection[] pair = BasicConnection.createPair(outboundRel,targetElement,inboundRel,sourceElement);
-    outboundRel.addConnection(pair[BasicConnection.OUTBOUND]);
-    inboundRel.addConnection(pair[BasicConnection.INBOUND]);
-    RelAddEvent event = new RelAddEvent(pair);
-    Enumeration eSource = getListeners();
-    Enumeration eTarget = targetElement.getListeners();
-    while (eSource.hasMoreElements())
-    {
-      ((ElementListener)eSource.nextElement()).relAdded(event);
-    }
-
-    while (eTarget.hasMoreElements())
-    {
-      ((ElementListener)eTarget.nextElement()).relAdded(event);
-    }
-
-
-    return true;
-  }
-
-  public boolean disconnect ( Element targetElement, String outboundRelName )
-  {
-    return disconnect(targetElement,getRel(outboundRelName));
-  }
-
-  public boolean disconnectRel ( String outboundRelName )
-  {
-    return disconnectRel(getRel(outboundRelName));
-  }
-
-  public boolean disconnectAll ()
-  {
-    if (fModel == null) return false;
-    Enumeration e = fRels.elements();
-    while (e.hasMoreElements())
-    {
-      Rel rel = (Rel)e.nextElement();
-      disconnectRel(rel);
-    }
-    return true;
-  }
-
-  public Enumeration getElements ( String relName )
-  {
-    return getRel(relName).getTargetElements();
-  }
-
-  public int getNumberOfElements ( String relName )
-  {
-    return getRel(relName).getNumberOfTargetElements();
-  }
-
-  public Rel getRel ( String relName )
-  {
-    Rel rel = (Rel)fRels.get(relName);
-    if (rel == null)
-    {
-      rel = new BasicRel(relName,this);
-      fRels.put(relName,rel);
-    }
-    return rel;
-  }
-
-  public Enumeration getRels ()
-  {
-    return fRels.elements();
-  }
-
-  public Enumeration getListeners()
-  {
-    return fListeners.elements();
-  }
-
-  protected boolean disconnect ( Element targetElement, Rel outboundRel )
-  {
-    if (fModel == null || fModel != targetElement.getModel() || outboundRel == null) return false;
-    Connection outboundConnection = outboundRel.getConnectionTo(targetElement);
-    if (outboundConnection == null) return false;
-    Connection inboundConnection = outboundConnection.getOpposingConnection();
-    RelRemoveEvent event = new RelRemoveEvent(new Connection [] {outboundConnection,inboundConnection});
-      Enumeration e = fListeners.elements();
-      while (e.hasMoreElements())
-      {
-        ((ElementListener)e.nextElement()).relRemoved(event);
-      }
-
-    Enumeration eTarget = targetElement.getListeners();
-    while (eTarget.hasMoreElements())
-    {
-      ((ElementListener)eTarget.nextElement()).relRemoved(event);
-    }
-
-    Rel inboundRel = inboundConnection.getRel();
-    boolean done = outboundRel.removeConnection(outboundConnection);
-    inboundRel.removeConnection(inboundConnection);
-    return done;
-  }
-
-  protected boolean disconnectRel ( Rel outboundRel )
-  {
-    if (fModel == null || outboundRel == null) return false;
-    Element[] elements = new Element[outboundRel.getNumberOfTargetElements()];
-    int i = 0;
-    Enumeration e = outboundRel.getTargetElements();
-    while (e.hasMoreElements())
-    {
-      elements[i++] = (Element)e.nextElement();
-    }
-    while (i-- > 0)
-    {
-      disconnect(elements[i],outboundRel);
-    }
-    return true;
-  }
-
-  public String toString ()
-  {
-    return getName();
-  }
-}
-
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/BasicModel.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/BasicModel.java
deleted file mode 100644
index 3b3b435..0000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/BasicModel.java
+++ /dev/null
@@ -1,149 +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.wst.ws.internal.datamodel;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Vector;
-
-public class BasicModel implements Model
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  private String fName;
-  private Hashtable fElements;
-  private Element fRoot;
-  //This is used by the MUID
-  private int fUniqueNumberCounter;
-
-  public BasicModel ( String name )
-  {
-    fName = name;
-    fElements = new Hashtable();
-    fRoot = null;
-    fUniqueNumberCounter = 0;
-  }
-
-  public void setName ( String name )
-  {
-    fName = name;
-  }
-
-  public String getName ()
-  {
-    return fName;
-  }
-
-
-  /*
-  * simple counter that increments each call 
-  */
-  public int getUniqueNumber()
-  {
-    fUniqueNumberCounter++;
-    return fUniqueNumberCounter;
-  }
-
-  /*
-  * This will use a unique number and append it to the end of the name 
-  * @param String name of the element
-  * @return String MUID
-  */
-  public String makeMUID(String name)
-  {
-    String num = String.valueOf(getUniqueNumber());
-    String muid = name + num;
-    return muid;
-  }
-
-
-  public boolean setRootElement ( Element root )
-  {
-    if (root.getModel() == null)
-      addElement(root);
-    else if (root.getModel() != this)
-      return false;
-    fRoot = root;
-    return true;
-  }
-
-  public Element getRootElement ()
-  {
-    if (fRoot == null) fRoot = getFirstElement();
-    return fRoot;
-  }
-
-
-  /**
-  * Get the elements that have this name
-  * @param String name the name of the element 
-  * @return Vector a vector of elements that have this name
-  * These elements may be of different types
-  **/
-
-  public Vector getElementsByName(String name)
-  {
-    Vector vector = new Vector();
-    Enumeration e = fElements.keys();
-    while (e.hasMoreElements()){
-       Element element = (Element)e.nextElement();
-       if (element.getName().equals(name)) vector.addElement(element);
-    }
-    return vector;
-  }
-
- 
-
-  public boolean addElement ( Element element )
-  {
-    if (element.getModel() != null) return false;
-    fElements.put(element,element);
-    return true;
-  }
-
-  public boolean removeElement ( Element element )
-  {
-    if (element.getModel() != this) return false;
-    element.disconnectAll();
-    if (fRoot == element) fRoot = null;
-    return (fElements.remove(element) == element);
-  }
-
-  public Enumeration getElements ()
-  {
-    return fElements.elements();
-  }
-
-  public int getNumberOfElements ()
-  {
-    return fElements.size();
-  }
-
-  public boolean containsElement ( Element element )
-  {
-    return fElements.contains(element);
-  }
-
-  private Element getFirstElement ()
-  {
-    Enumeration e = getElements();
-    return (e.hasMoreElements() ? (Element)e.nextElement() : null);
-  }
-
-  public String toString ()
-  {
-    return getName();
-  }
-}
-
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/BasicProperty.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/BasicProperty.java
deleted file mode 100644
index 6661a82..0000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/BasicProperty.java
+++ /dev/null
@@ -1,70 +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.wst.ws.internal.datamodel;
-
-public class BasicProperty implements Property
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  private String fName;
-  private Object fValue;
-
-  public BasicProperty ( String name )
-  {
-    fName = name;
-  }
-
-  public BasicProperty ( String name, Object value )
-  {
-    fName = name;
-    fValue = value;
-  }
-
-  /**
-  * Returns a shallow clone of this <code>Property</code>.
-  * Property key and value references are cloned,
-  * but the value objects themselves are not cloned.
-  * @return Property A new Property.
-  */
-  public Property shallowClone ()
-  {
-    return new BasicProperty(fName,fValue);
-  }
-
-  public String getName ()
-  {
-    return fName;
-  }
-
-  public void setValue ( Object value )
-  {
-    fValue = value;
-  }
-
-  public Object getValue ()
-  {
-    return fValue;
-  }
-
-  public void setValueAsString ( String value )
-  {
-    fValue = value;
-  }
-
-  public String getValueAsString ()
-  {
-    return (fValue != null ? fValue.toString() : null);
-  }
-}
-
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/BasicRel.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/BasicRel.java
deleted file mode 100644
index 41336fb..0000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/BasicRel.java
+++ /dev/null
@@ -1,100 +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.wst.ws.internal.datamodel;
-
-import java.util.Enumeration;
-import java.util.Vector;
-
-public class BasicRel implements Rel
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  private String fName;
-  private Element fSourceElement;
-  private Vector fConnections;
-
-  public BasicRel ( String name, Element sourceElement )
-  {
-    fName = name;
-    fSourceElement = sourceElement;
-    fConnections = new Vector();
-  }
-
-  public String getName ()
-  {
-    return fName;
-  }
-
-  public Element getSourceElement ()
-  {
-    return fSourceElement;
-  }
-
-  public Enumeration getTargetElements ()
-  {
-    return new ElementEnumeration(fConnections.elements());
-  }
-
-  public int getNumberOfTargetElements ()
-  {
-    return fConnections.size();
-  }
-
-  public void addConnection ( Connection connection )
-  {
-    fConnections.addElement(connection);
-  }
-
-  public boolean removeConnection ( Connection connection )
-  {
-    return fConnections.removeElement(connection);
-  }
-
-  public Connection getConnectionTo ( Element targetElement )
-  {
-    Enumeration e = fConnections.elements();
-    while (e.hasMoreElements())
-    {
-      Connection c = (Connection)e.nextElement();
-      if (c.getElement() == targetElement) return c;
-    }
-    return null;
-  }
-
-  public String toString ()
-  {
-    return getName();
-  }
-
-  private class ElementEnumeration implements Enumeration
-  {
-    private Enumeration fConnectionEnumeration;
-
-    public ElementEnumeration ( Enumeration connectionEnumeration )
-    {
-      fConnectionEnumeration = connectionEnumeration;
-    }
-
-    public boolean hasMoreElements ()
-    {
-      return fConnectionEnumeration.hasMoreElements();
-    }
-
-    public Object nextElement ()
-    {
-      return ((Connection)fConnectionEnumeration.nextElement()).getElement();
-    }
-  }
-}
-
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/Connection.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/Connection.java
deleted file mode 100644
index 8d6270c..0000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/Connection.java
+++ /dev/null
@@ -1,57 +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.wst.ws.internal.datamodel;
-
-/**
-* This is the abstract class for a connection that ties a Rel to a Node.
-* Normally Connection objects are manufactured and managed within the
-* derived classes of the Model framework, and are not manipulated by
-* the caller directly.
-*/
-public interface Connection
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  /**
-  * Returns the Rel that owns this connection.
-  * @return Rel The Rel that owns this connection.
-  * This method never returns null, that is, a Connection
-  * cannot exist without a Rel to own it.
-  */
-  public Rel getRel ();
-
-  /**
-  * Returns the Node that this connection points to.
-  * @return Node The Node this connection points to.
-  * This method never returns null, that is, a Connection
-  * cannot exist without a Node to point to.
-  */
-  public Element getElement ();
-
-  /**
-  * Returns the opposing connection to this connection.
-  * Connection objects always exist in pairs, that is,
-  * if node "Parent" has a relationship named "Children"
-  * containing a connection to node "Child", then there
-  * must exist an opposing connection from "Child" to
-  * "Parent" in some relationship of "Child" (for example,
-  * in a relationship called "Parents").
-  * @return Connection The opposing connection.
-  * As a general rule, this method should never return null.
-  * It may only return null during construction of the pair
-  * of connections.
-  */
-  public Connection getOpposingConnection ();
-}
-
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/Element.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/Element.java
deleted file mode 100644
index c23721b..0000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/Element.java
+++ /dev/null
@@ -1,265 +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.wst.ws.internal.datamodel;
-
-import java.util.Enumeration;
-
-/**
-* This is the abstract class for elements that can be managed by a Model.
-* Every element has a name, a set of properties, and a set of relationships
-* to other elements.
-*/
-public interface Element
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  /**
-  * Returns a clone of this <code>Element</code>
-  * of the same class and with the same name and model,
-  * but with no Properties, Rels or Listeners except for
-  * the {@link Property#NAME NAME} property.
-  * @return Object A new Element.
-  */
-  public Element shallowClone ();
-
-  /**
-  * Returns a clone of this <code>Element</code>
-  * of the same class and with the same name and model
-  * and with a copy of the original Element's Properties.
-  * The Rels and Listeners are not cloned.
-  * @return Element A new Element.
-  */
-  public Element deepClone ();
-
-  /**
-  * Returns the model this element belongs to, or null if the element
-  * has not been added to a model. See also {@link #isValid isValid()}.
-  * @return Model The model this element belongs to, or null if none.
-  */
-  public Model getModel ();
-
-  /**
-  * Returns true if and only if this element belongs to a model.
-  * See also {@link #getModel getModel()}.
-  * @return boolean True if and only if this element belongs to a model.
-  */
-  public boolean isValid ();
-
-  /**
-  * Removes this element from the model to which it currently belongs.
-  * After calling this method, {@link #getModel getModel()} will return
-  * null and {@link #isValid isValid()} will return false.
-  * @return boolean True if the element was successfully removed from
-  * its model. This method returns false if the element does not belong
-  * to any model.
-  */
-  public boolean remove ();
-
-  /**
-  * Sets the name of this element and updates the "name" property.
-  * Every element includes a property called "name" (see Property.NAME)
-  * whose value is the same string as passed into setName().
-  * @param name The name of this element.
-  */
-  public void setName ( String name );
-
-  /**
-  *
-  */
-  public void addListener ( ElementListener listener );
-
-  /**
-  * Returns the name of this element.
-  * @return String The name of this element.
-  */
-  public String getName ();
-
-  /**
-  * Adds or sets a property of this element.
-  * Properties set using this method can be retrieved using either
-  * {@link #getProperty getProperty()} or
-  * {@link #getPropertyAsObject getPropertyAsObject()}.
-  * Every element includes a property called "name" (see Property.NAME)
-  * whose value is the same string as passed into {@link #setName setName()}.
-  * Any previous property with the same name is replaced.
-  * @param property The property to set.
-  */
-  public void setProperty ( Property property );
-
-  /**
-  * Adds or sets a property of this element.
-  * Properties set using this method can be retrieved using either
-  * {@link #getProperty getProperty()} or
-  * {@link #getPropertyAsObject getPropertyAsObject()}.
-  * Every element includes a property called "name" (see Property.NAME)
-  * whose value is the same string as passed into {@link #setName setName()}.
-  * Any previous property with the same name is replaced.
-  * @param name The name of the property to set.
-  * @param value The Object value of the property to set.
-  */
-  public void setPropertyAsObject ( String name, Object value );
-
-  /**
-  * Adds or sets a String property of this element.
-  * Properties set using this method can be retrieved using either
-  * {@link #getProperty getProperty()},
-  * {@link #getPropertyAsObject getPropertyAsObject()} or
-  * {@link #getPropertyAsString getPropertyAsString()}.
-  * Every element includes a property called "name" (see Property.NAME)
-  * whose value is the same string as passed into {@link #setName setName()}.
-  * Any previous property with the same name is replaced.
-  * @param name The name of the property to set.
-  * @param value The String value of the property to set.
-  */
-  public void setPropertyAsString ( String name, String value );
-
-  /**
-  * Returns a property of the given name or null if there is none.
-  * Every element includes a property called "name" (see Property.NAME)
-  * whose value is the same string as passed into {@link #setName setName()}.
-  * @param name The name of the property to return.
-  * @return Property The property, or null if none.
-  */
-  public Property getProperty ( String name );
-
-  /**
-  * Returns the Object value of a property of the given name or null
-  * if there is none.
-  * Every element includes a property called "name" (see Property.NAME)
-  * whose value is the same string as passed into {@link #setName setName()}.
-  * @param name The name of the property to return.
-  * @return Object The property value as an Object, or null if none.
-  */
-  public Object getPropertyAsObject ( String name );
-
-  /**
-  * Returns the String value of a property of the given name or null
-  * if there is none.
-  * Every element includes a property called "name" (see Property.NAME)
-  * whose value is the same string as passed into {@link #setName setName()}.
-  * @param name The name of the property to return.
-  * @return String The property value as a String, or null if none.
-  */
-  public String getPropertyAsString ( String name );
-
-  /**
-  * Returns an enumeration of all properties of this element.
-  * There is always at least one property that carries the
-  * name of this element (see {@link #setName setName()}).
-  * @return Enumeration An enumeration of all properties of this element.
-  */
-  public Enumeration getProperties ();
-
-  /**
-  * Creates a bidirectional relationship between this element and another.
-  * Both relationships are identified by names. The names of all the
-  * outbound relationships of a element must be mutually unique.
-  * @param element The element to connect to.
-  * @param outboundRelName The name of the relationship to contain the
-  * connection to the element.
-  * @param inboundRelName The name of the relationship to contain the
-  * inverse connection back to this element.
-  * @return boolean True if the connection is created successfully.
-  * Both elements must belong to the same model, other false is returned.
-  */
-  public boolean connect ( Element element, String outboundRelName, String inboundRelName );
-
-  /**
-  * Dismantles the connection to another element in a given relationship.
-  * The inverse connection is also automatically dismantled.
-  * @param element The element to disconnect from.
-  * @param outboundRelName The name of the relationship containing
-  * the connection to the element.
-  * @return boolean True if the connection is removed successfully.
-  * Both elements must belong to the same model, other false is returned.
-  * If the elements are not connected through the given relationship, then
-  * false is returned.
-  */
-  public boolean disconnect ( Element element, String outboundRelName );
-
-  /**
-  * Dismantles the connection to all elements in the given relationship.
-  * The inverse connections are also automatically dismantled.
-  * @param outboundRelName The name of the relationship.
-  * @return boolean True if all connections are removed successfully.
-  * This method returns false if the element does not belong to a model.
-  */
-  public boolean disconnectRel ( String outboundRelName );
-
-  /**
-  * Dismantles all connections from this element.
-  * @return boolean True if all connections are removed successfully.
-  * This method returns false if the element does not belong to a model.
-  */
-  public boolean disconnectAll ();
-
-  /**
-  * Returns an enumeration of all elements
-  * connected thru the given relationship.
-  * @param relName The name of the relationship.
-  * @return Enumeration The elements in the relationship.
-  * This method never returns null.
-  */
-  public Enumeration getElements ( String relName );
-
-  /**
-  * Returns the number of elements in the given relationship.
-  * @param relName The name of the relationship.
-  * @return int The number of elements in the relationship.
-  * This method never returns a negative value.
-  */
-
-  public Enumeration getListeners();
-
-  public int getNumberOfElements ( String relName );
-
-  /**
-  * Returns the relationship object of the given name.
-  * @param relName The name of the relationship.
-  * @return int The relationship. This method never returns null.
-  * In other words, any reference to a relationship name automatically
-  * brings a corresponding Rel object into existence. Careless naming
-  * may result in the {@link #getRels getRels()} method returning an enumeration of
-  * more relationships than would be meaningful, efficient or useful.
-  */
-  public Rel getRel ( String relName );
-
-  /**
-  * Returns an enumeration of all known relationships.
-  * @return Enumeration The outbound relationships of the element.
-  * This method never returns null.
-  */
-  public Enumeration getRels ();
-
-
-  /*
-  * There is a need sometimes for each element in a model to have a unique identifier.
-  * Normally this would be left to a name, but since the element maker gives it its name
-  * there is a chance that a model could have two elements with the same name. If they 
-  * are the same element type then there would be no way to differenciate between the two.
-  * The following getter and setter will provide a unique identifier. This identifier will be known 
-  * as the muid or Model Unique Identifier. Unlike a uuid it will only be assured uniqueness 
-  * within its own model. The intention is to use a unique number appended to the end 
-  * of the name.
-  * The following is the getter
-  * @return String the unique identifier
-  */
-
-  public String getMUID();
-  
-  
-
-
-}
-
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/ElementAdapter.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/ElementAdapter.java
deleted file mode 100644
index ec0cfd8..0000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/ElementAdapter.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.ws.internal.datamodel;
-
-/**
-* This is where we store all the state data that various UIs
-* (such as the NewWSDLCreationWizard) capture from the user
-* and then need to process.
-*/
-public class ElementAdapter implements ElementListener
-{
-  /**
-  * Called when a property is added to the model.
-  * @param event The event containing the model, property and value.
-  */
-  public void propertyAdded ( PropertyAddEvent event )
-  {
-  }
-
-  /**
-  * Called when a property in the model changes.
-  * @param event The event containing the model, property, old value
-  * and new value.
-  */
-  public void propertyChanged ( PropertyChangeEvent event )
-  {
-  }
-
-  /**
-  * Called when a property in the model is removed.
-  * @param event The event containing the model, property and old value.
-  */
-  public void propertyRemoved ( PropertyRemoveEvent event )
-  {
-  }
-
-  /**
-  * Called when a property is added to the model.
-  * @param event The event containing the model, property and value.
-  */
-  public void relAdded ( RelAddEvent event )
-  {
-  }
-
-  /**
-  * Called when a property is added to the model.
-  * @param event The event containing the model, property and value.
-  */
-  public void relRemoved ( RelRemoveEvent event )
-  {
-  }
-}
-
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/ElementListener.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/ElementListener.java
deleted file mode 100644
index 44819e3..0000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/ElementListener.java
+++ /dev/null
@@ -1,56 +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.wst.ws.internal.datamodel;
-
-/**
-* This is where we store all the state data that various UIs
-* (such as the NewWSDLCreationWizard) capture from the user
-* and then need to process.
-*/
-public interface ElementListener
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  /**
-  * Called when a property is added to the model.
-  * @param event The event containing the model, property and value.
-  */
-  public void propertyAdded ( PropertyAddEvent event );
-
-  /**
-  * Called when a property in the model changes.
-  * @param event The event containing the model, property, old value
-  * and new value.
-  */
-  public void propertyChanged ( PropertyChangeEvent event );
-
-  /**
-  * Called when a property in the model is removed.
-  * @param event The event containing the model, property and old value.
-  */
-  public void propertyRemoved ( PropertyRemoveEvent event );
-
-  /**
-  * Called when a property is added to the model.
-  * @param event The event containing the model, property and value.
-  */
-  public void relAdded ( RelAddEvent event );
-
-  /**
-  * Called when a property is added to the model.
-  * @param event The event containing the model, property and value.
-  */
-  public void relRemoved ( RelRemoveEvent event );
-}
-
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/Model.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/Model.java
deleted file mode 100644
index 72f297a..0000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/Model.java
+++ /dev/null
@@ -1,135 +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.wst.ws.internal.datamodel;
-
-import java.util.Enumeration;
-import java.util.Vector;
-
-/**
-* This is the abstract class for a simple data model consisting of
-* a network of named nodes (class Node). Every node carries a set
-* of named properties (class Property). Nodes are interrelated by
-* relationships (class Rel) and connections (class Connection).
-* Each Model keeps a registry of all of its nodes, and keeps a
-* reference to one "root" node that can be used as a starting
-* point for navigation.
-*/
-public interface Model
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  /**
-  * Sets the name of the model.
-  * @param name The name of the model.
-  */
-  public void setName ( String name );
-
-  /**
-  * Gets the name of the model.
-  * @return String The name of the model. This must not be null.
-  */
-  public String getName ();
-
-  /**
-  * Sets a node as the root of the model. If the node does not
-  * belong to a model, then it is added automatically. If the
-  * node already belongs to another model, then the root node
-  * is not set and method returns false.
-  * @param root The node to set as the root. The node must
-  * belong either to this model or to no model. This must
-  * not be null.
-  * @return boolean True if the node was set as the root.
-  * This method returns false if the given node already belongs
-  * to another model.
-  */
-  public boolean setRootElement ( Element root );
-
-  /**
-  * Returns the root node. This method always returns a node
-  * except on an empty Model. If setRootNode() has not been
-  * called, or if the last root node was removed from the model,
-  * then the method will select and return an arbitrary node as
-  * the root. This method will consistently return the same node
-  * until either
-  * (a) setRootNode() is called with a different node or
-  * (b) removeNode() is called to remove the node from the model.
-  * @return Node The current root node, or null if the model is empty.
-  */
-
-  public Element getRootElement ();
-
-  /**
-  * Get the elements that have this name
-  * @param String name the name of the element 
-  * @return Vector a vector of elements that have this name
-  * These elements may be of different types
-  **/
-
-  public Vector getElementsByName(String name);
-
-  /**
-  * Adds a node to the model. If the node already belongs to another
-  * model then it will not be added.
-  * @param node The node to add. This must not be null.
-  * @return boolean True if the node was added successfully.
-  * This method returns false if the given node already belongs to
-  * the current model or to another model.
-  */
-  public boolean addElement ( Element element );
-
-  /**
-  * Removes a node from the model.
-  * @param node The node to remove. This must not be null.
-  * @return boolean True if the node was removed successfully.
-  * This method returns false if the given node does not belong
-  * to this model.
-  */
-  public boolean removeElement ( Element element );
-
-  /**
-  * Returns an enumeration of all nodes in the model and in no
-  * particular order,
-  * @return Enumeration An enumeration of all nodes in the model.
-  * This method never returns null.
-  */
-  public Enumeration getElements ();
-
-  /**
-  * Returns the number of nodes in the model.
-  * @return int The number of nodes in the model.
-  * This method never returns a negative value.
-  */
-  public int getNumberOfElements ();
-
-  /**
-  * Determines if this model contains the given node.
-  * @param node The node to check for. This must not be null.
-  * @return boolean True if and only if the model contains the node.
-  */
-  public boolean containsElement ( Element element );
-
-  /*
-  * This function will provide the next number in the queue for the MUID
-  *
-  */
-  public int getUniqueNumber();
-
-  /*
-  * heres what we call from the element
-  */
-  public String makeMUID(String name);
-
-
-}
-
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/Property.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/Property.java
deleted file mode 100644
index 8e793ba..0000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/Property.java
+++ /dev/null
@@ -1,70 +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.wst.ws.internal.datamodel;
-
-/**
-* This is the abstract class for properties of a Node.
-* Every property has an immutable name and a value of type Object.
-*/
-public interface Property
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  /**
-  * Every Node has a property called "name" that is equivalent
-  * to and kept synchronized with Node.getName() and Node.setName().
-  */
-  public static final String NAME = "name";
-
-  /**
-  * Returns a shallow clone of this <code>Property</code>.
-  * Property key and value references are cloned,
-  * but the value objects themselves are not cloned.
-  * @return Property A new Property.
-  */
-  public Property shallowClone ();
-
-  /**
-  * Returns the name of this node.
-  * @return String The name of this node.
-  */
-  public String getName ();
-
-  /**
-  * Sets the value of this property.
-  * @param value The value to set. Any previous value is replaced.
-  */
-  public void setValue ( Object value );
-
-  /**
-  * Returns the value of this property.
-  * @return Object The value of this property, possibly null.
-  */
-  public Object getValue ();
-
-  /**
-  * Sets the value of this property as a string.
-  * @param value The string to set. Any previous value is replaced.
-  * The type of the previous value, if any, is of no consequence.
-  */
-  public void setValueAsString ( String value );
-
-  /**
-  * Returns the value of this property as a string.
-  * @return String the value of this property as a string, possibly null.
-  * If the set value is an arbitrary Object, then Object.toString() is
-  * returned.
-  */
-  public String getValueAsString ();
-}
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/PropertyAddEvent.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/PropertyAddEvent.java
deleted file mode 100644
index 62fc058..0000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/PropertyAddEvent.java
+++ /dev/null
@@ -1,66 +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.wst.ws.internal.datamodel;
-
-/**
-* Carries data relevant to when a property is added to the model.
-*/
-public class PropertyAddEvent
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  /**
-  * The model the changed.
-  */
-  protected BasicElement fElement;
-
-  /**
-  * The property that was added.
-  */
-  protected Property fProperty;
-
- 
-  /**
-   * Constructor.
-   * @param model The model that changed.
-   * @param property The property that was added.
-   * @param value The property's value.
-   */
-  public PropertyAddEvent ( BasicElement element, Property property)
-  {
-    fElement = element;
-    fProperty = property;
-  }
-
-  /**
-   * Returns the model that changed (that produced this event).
-   * @return TinyModel The model that changed.
-   */
-  public BasicElement getElement ()
-  {
-    return fElement;
-  }
-
-  /**
-   * Returns the model property that was added.
-   * @return TinyModel The property that was added.
-   */
-  public Property getProperty ()
-  {
-    return fProperty;
-  }
-
-  
-}
-
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/PropertyChangeEvent.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/PropertyChangeEvent.java
deleted file mode 100644
index 0ade7cb..0000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/PropertyChangeEvent.java
+++ /dev/null
@@ -1,81 +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.wst.ws.internal.datamodel;
-
-/**
-* Carries data relevant to when a property is changed in the model.
-*/
-public class PropertyChangeEvent
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  /**
-  * The model the changed.
-  */
-  protected BasicElement fElement;
-
-  /**
-  * The property that changed.
-  */
-  protected Property fProperty;
-
-  /**
-  * The property's old value.
-  */
-  protected Property fOldProperty;
-
-   /**
-   * Constructor.
-   * @param model The model that changed.
-   * @param property The property that changed.
-   * @param oldValue The property's old value.
-   * @param newValue The property's new value.
-   */
-  public PropertyChangeEvent ( BasicElement element , Property property, Property oldProperty )
-  {
-    fElement = element;
-    fProperty = property;
-    fOldProperty = oldProperty;
-  }
-
-  /**
-   * Returns the model that changed (that produced this event).
-   * @return TinyModel The model that changed.
-   */
-  public BasicElement getElement ()
-  {
-    return fElement;
-  }
-
-  /**
-   * Returns the model property that changed.
-   * @return TinyModel The property that changed.
-   */
-  public Property getProperty ()
-  {
-    return fProperty;
-  }
-
-  /**
-   * Returns the model property's old value.
-   * @return TinyModel The property's old value.
-   */
-  public Property getOldProperty ()
-  {
-    return fOldProperty;
-  }
-
-  
-}
-
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/PropertyRemoveEvent.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/PropertyRemoveEvent.java
deleted file mode 100644
index be468da..0000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/PropertyRemoveEvent.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 Eclipse Public License v1.0
- * which accompanies this 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.datamodel;
-
-/**
-* Carries data relevant to when a property is removed from the model.
-*/
-public class PropertyRemoveEvent
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  /**
-  * The model the changed.
-  */
-  protected BasicElement fElement;
-
-  /**
-  * The property that was removed.
-  */
-  protected Property fProperty;
-
-  /**
-   * Constructor.
-   * @param model The model that changed.
-   * @param property The property that was removed.
-   * @param value The property's value.
-   */
-  public PropertyRemoveEvent ( BasicElement element, Property property)
-  {
-    fElement = element;
-    fProperty = property;
-  }
-
-  /**
-   * Returns the model that changed (that produced this event).
-   * @return TinyModel The model that changed.
-   */
-  public BasicElement getElement ()
-  {
-    return fElement;
-  }
-
-  /**
-   * Returns the model property that was removed.
-   * @return TinyModel The property that was removed.
-   */
-  public Property getProperty ()
-  {
-    return fProperty;
-  }
-
-}
-
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/Rel.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/Rel.java
deleted file mode 100644
index 661a6df..0000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/Rel.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.wst.ws.internal.datamodel;
-
-import java.util.Enumeration;
-
-/**
-* This is the abstract class for relationships in a Model.
-*/
-public interface Rel
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  /**
-  * Returns the name of this relationship. Relationship names
-  * cannot be changed.
-  * @return String The name of the relationship.
-  */
-  public String getName ();
-
-  /**
-  * Returns the node that owns this relationship.
-  * @return Node The node that owns this relationship.
-  * This method never returns null, that is, relationships
-  * cannot exist in the absence of a node.
-  */
-  public Element getSourceElement();
-
-  /**
-  * Returns an enumeration of all nodes in this relationship.
-  * @return Enumeration The nodes in this relationship.
-  * This method never returns null.
-  */
-  public Enumeration getTargetElements ();
-
-  /**
-  * Returns the number of nodes in this relationship.
-  * @return int The number of nodes in this relationship.
-  * This method never returns a negative value.
-  */
-  public int getNumberOfTargetElements ();
-
-  /**
-  * Adds a connection to this relationship. This method is
-  * intended for use by derivations of the Model framework,
-  * not by users of the framework. Connection objects should
-  * only be constructed, added, removed and retrieved by
-  * implementations of the Node and Rel interfaces.
-  * @param connection The connection to add.
-  */
-  public void addConnection ( Connection connection );
-
-  /**
-  * Removes a connection from this relationship. This method is
-  * intended for use by derivations of the Model framework,
-  * not by users of the framework. Connection objects should
-  * only be constructed, added, removed and retrieved by
-  * implementations of the Node and Rel interfaces.
-  * @param connection The connection to remove.
-  * @return boolean True if the connection was found and removed.
-  */
-  public boolean removeConnection ( Connection connection );
-
-  /**
-  * Returns the Connection object for the given target node.
-  * This method is intended for use by derivations of the Model
-  * framework, not by users of the framework. Connection objects
-  * should only be constructed, added, removed and retrieved by
-  * implementations of the Node and Rel interfaces.
-  * @param targetNode The node to find the Connection to.
-  * @return Connection The connection, or null if none.
-  */
-  public Connection getConnectionTo ( Element targetElement );
-}
-
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/RelAddEvent.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/RelAddEvent.java
deleted file mode 100644
index 41a10f7..0000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/RelAddEvent.java
+++ /dev/null
@@ -1,110 +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.wst.ws.internal.datamodel;
-
-/**
-* Carries data relevant to when a property is added to the model.
-*/
-public class RelAddEvent
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  /**
-  * The model the changed.
-  */
-  protected Connection fOutBound;
-
-  /**
-  * The model the changed.
-  */
-  protected Connection fInBound;
-
-  /**
-  * The property that was added.
-  */
-  protected Property fProperty;
-
- 
-  /**
-   * Constructor.
-   * @param model The model that changed.
-   * @param property The property that was added.
-   * @param value The property's value.
-   */
-  public RelAddEvent (Connection[] pair)
-  {
-     fOutBound = pair[BasicConnection.OUTBOUND];
-     fInBound = pair[BasicConnection.INBOUND];
-  }
-
-  /**
-   * Returns the outbound connection that changed 
-  **/
-  public Connection getOutBoundConnection ()
-  {
-    return fOutBound;
-  }
-
-  /**
-   * Returns the changed rel name 
-  **/
-  public String getOutBoundRelName()
-  {
-    return fOutBound.getRel().getName();
-  }
-
-  /**
-   * Returns the changed rel
-  **/
-  public Rel getOutBoundRel()
-  {
-    return fOutBound.getRel();
-  }
-
-  /**
-   * Returns the changed rel name 
-  **/
-  public String getInBoundRelName()
-  {
-    return fInBound.getRel().getName();
-  }
-
-  /**
-   * Returns the changed rel
-  **/
-  public Rel getInBoundRel()
-  {
-    return fInBound.getRel();
-  }
-
-  /**
-   * Returns the outbound element that changed 
-  **/
-  public Element getParentElement ()
-  {
-    return fOutBound.getElement();
-  }
-
-  
-  /**
-   * Returns the inbound connection that changed 
-  **/
-  public Element getChildElement ()
-  {
-    return fInBound.getElement();
-  }
-
-  
-}
-
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/RelRemoveEvent.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/RelRemoveEvent.java
deleted file mode 100644
index d8fa4f7..0000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/RelRemoveEvent.java
+++ /dev/null
@@ -1,122 +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.wst.ws.internal.datamodel;
-
-/**
-* Carries data relevant to when a property is added to the model.
-*/
-public class RelRemoveEvent
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  /**
-  * The model the changed.
-  */
-  protected Connection fOutBound;
-
-  /**
-  * The model the changed.
-  */
-  protected Connection fInBound;
-
-  /**
-  * The property that was added.
-  */
-  protected Property fProperty;
-
- 
-  /**
-   * Constructor.
-   * @param model The model that changed.
-   * @param property The property that was added.
-   * @param value The property's value.
-   */
-  public RelRemoveEvent (Connection[] pair)
-  {
-     fOutBound = pair[BasicConnection.OUTBOUND];
-     fInBound = pair[BasicConnection.INBOUND];
-  }
-
-  /**
-   * Returns the model that changed (that produced this event).
-   * @return TinyModel The model that changed.
-   */
-  public Connection getOutBound ()
-  {
-    return fOutBound;
-  }
-
-  /**
-   * Returns the model property that was added.
-   * @return TinyModel The property that was added.
-   */
-  public Connection getInBound ()
-  {
-    return fInBound;
-  }
-
-  /**
-   * Returns the changed rel name 
-  **/
-  public String getOutBoundRelName()
-  {
-    return fOutBound.getRel().getName();
-  }
-
-  /**
-   * Returns the changed rel
-  **/
-  public Rel getOutBoundRel()
-  {
-    return fOutBound.getRel();
-  }
-
-  /**
-   * Returns the changed rel name 
-  **/
-  public String getInBoundRelName()
-  {
-    return fInBound.getRel().getName();
-  }
-
-  /**
-   * Returns the changed rel
-  **/
-  public Rel getInBoundRel()
-  {
-    return fInBound.getRel();
-  }
-  
-
-  /**
-   * Returns the outbound element that changed 
-  **/
-  public Element getOutBoundElement ()
-  {
-    return fOutBound.getElement();
-  }
-
-  
-  /**
-   * Returns the inbound connection that changed 
-  **/
-  public Element getInboundElement ()
-  {
-    return fInBound.getElement();
-  }
-  
-
-  
-}
-
-
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/AbstractClientFragment.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/AbstractClientFragment.java
deleted file mode 100644
index 606032c..0000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/AbstractClientFragment.java
+++ /dev/null
@@ -1,74 +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.extensions;
-
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.fragment.CommandFactoryFragment;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IContext;
-import org.eclipse.wst.ws.internal.provisional.wsrt.ISelection;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceClient;
-
-public abstract class AbstractClientFragment extends CommandFactoryFragment
-{
-  protected IWebServiceClient webServiceClient_;
-  protected Environment       environment_;
-  protected IContext          context_;
-  protected ISelection        selection_;
-  protected String            module_;
-  protected String            ear_;
-    
-  public AbstractClientFragment()
-  {
-  }
-  
-  protected AbstractClientFragment( AbstractClientFragment fragment )
-  {
-	super( fragment ); 
-	
-	webServiceClient_ = fragment.webServiceClient_;
-	environment_      = fragment.environment_;
-	context_          = fragment.context_;
-	selection_        = fragment.selection_;
-	module_           = fragment.module_;
-	ear_              = fragment.ear_;
-  }
-    
-  public void setWebService( IWebServiceClient webService )
-  {
-	webServiceClient_ = webService;  
-  }
-
-  public void setEnvironment( Environment environment )
-  {
-	environment_ = environment;
-  }
-  
-  public void setContext( IContext context )
-  {	  
-	context_ = context;
-  }
-  
-  public void setSelection( ISelection selection )
-  {
-	selection_ = selection;  
-  }
-  
-  public void setModule( String module )
-  {
-	module_ = module;
-  }
-  
-  public void setEar( String ear )
-  {
-	ear_ = ear;  
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/AbstractServiceFragment.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/AbstractServiceFragment.java
deleted file mode 100644
index 9898711..0000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/AbstractServiceFragment.java
+++ /dev/null
@@ -1,74 +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.extensions;
-
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.fragment.CommandFactoryFragment;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IContext;
-import org.eclipse.wst.ws.internal.provisional.wsrt.ISelection;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebService;
-
-public abstract class AbstractServiceFragment extends CommandFactoryFragment
-{
-  protected IWebService webService_;
-  protected Environment environment_;
-  protected IContext    context_;
-  protected ISelection  selection_;
-  protected String      module_;
-  protected String      ear_;
-    
-  public AbstractServiceFragment()
-  {
-  }
-  
-  protected AbstractServiceFragment( AbstractServiceFragment fragment )
-  {
-	super( fragment ); 
-	
-	webService_  = fragment.webService_;
-	environment_ = fragment.environment_;
-	context_     = fragment.context_;
-	selection_   = fragment.selection_;
-	module_      = fragment.module_;
-	ear_         = fragment.ear_;
-  }
-    
-  public void setWebService( IWebService webService )
-  {
-	webService_ = webService;  
-  }
-
-  public void setEnvironment( Environment environment )
-  {
-	environment_ = environment;
-  }
-  
-  public void setContext( IContext context )
-  {	  
-	context_ = context;
-  }
-  
-  public void setSelection( ISelection selection )
-  {
-	selection_ = selection;  
-  }
-  
-  public void setModule( String module )
-  {
-	module_ = module;
-  }
-  
-  public void setEar( String ear )
-  {
-	ear_ = ear;  
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/AssembleClientFragment.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/AssembleClientFragment.java
deleted file mode 100644
index 336a0ea..0000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/AssembleClientFragment.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.wst.ws.internal.extensions;
-
-import java.util.Vector;
-
-import org.eclipse.wst.command.internal.provisional.ICommandFactory;
-import org.eclipse.wst.command.internal.provisional.SimpleCommandFactory;
-
-public class AssembleClientFragment extends AbstractClientFragment 
-{
-  public AssembleClientFragment()
-  {
-  }
-  
-  protected AssembleClientFragment( AssembleClientFragment fragment )
-  {
-	super( fragment );  
-  }
-  
-  public Object clone() 
-  {
-	return new AssembleClientFragment();
-  }
-
-  public ICommandFactory getICommandFactory() 
-  {
-	ICommandFactory factory = null;
-	
-	if( webServiceClient_ == null )
-	{
-	  factory = new SimpleCommandFactory( new Vector() );
-	}
-	else
-	{
-	  factory = webServiceClient_.assemble( environment_, context_, selection_, module_, ear_ );	
-	}
-	
-	return factory;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/AssembleServiceFragment.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/AssembleServiceFragment.java
deleted file mode 100644
index 47f7d0d..0000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/AssembleServiceFragment.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.wst.ws.internal.extensions;
-
-import java.util.Vector;
-
-import org.eclipse.wst.command.internal.provisional.ICommandFactory;
-import org.eclipse.wst.command.internal.provisional.SimpleCommandFactory;
-
-public class AssembleServiceFragment extends AbstractServiceFragment 
-{
-  public AssembleServiceFragment()
-  {
-  }
-  
-  protected AssembleServiceFragment( AssembleServiceFragment fragment )
-  {
-	super( fragment );  
-  }
-  
-  public Object clone() 
-  {
-	return new AssembleServiceFragment();
-  }
-
-  public ICommandFactory getICommandFactory() 
-  {
-	ICommandFactory factory = null;
-	
-	if( webService_ == null )
-	{
-	  factory = new SimpleCommandFactory( new Vector() );
-	}
-	else
-	{
-	  factory = webService_.assemble( environment_, context_, selection_, module_, ear_ );	
-	}
-	
-	return factory;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/DeployClientFragment.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/DeployClientFragment.java
deleted file mode 100644
index 9afa459..0000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/DeployClientFragment.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.wst.ws.internal.extensions;
-
-import java.util.Vector;
-
-import org.eclipse.wst.command.internal.provisional.ICommandFactory;
-import org.eclipse.wst.command.internal.provisional.SimpleCommandFactory;
-
-public class DeployClientFragment extends AbstractClientFragment 
-{
-  public DeployClientFragment()
-  {
-  }
-  
-  protected DeployClientFragment( DeployClientFragment fragment )
-  {
-	super( fragment );  
-  }
-  
-  public Object clone() 
-  {
-	return new DeployClientFragment();
-  }
-
-  public ICommandFactory getICommandFactory() 
-  {
-	ICommandFactory factory = null;
-	
-	if( webServiceClient_ == null )
-	{
-	  factory = new SimpleCommandFactory( new Vector() );
-	}
-	else
-	{
-	  factory = webServiceClient_.deploy( environment_, context_, selection_, module_, ear_ );	
-	}
-	
-	return factory;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/DeployServiceFragment.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/DeployServiceFragment.java
deleted file mode 100644
index da3dc37..0000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/DeployServiceFragment.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.wst.ws.internal.extensions;
-
-import java.util.Vector;
-
-import org.eclipse.wst.command.internal.provisional.ICommandFactory;
-import org.eclipse.wst.command.internal.provisional.SimpleCommandFactory;
-
-public class DeployServiceFragment extends AbstractServiceFragment 
-{
-  public DeployServiceFragment()
-  {
-  }
-  
-  protected DeployServiceFragment( DeployServiceFragment fragment )
-  {
-	super( fragment );  
-  }
-  
-  public Object clone() 
-  {
-	return new DeployServiceFragment();
-  }
-
-  public ICommandFactory getICommandFactory() 
-  {
-	ICommandFactory factory = null;
-	
-	if( webService_ == null )
-	{
-	  factory = new SimpleCommandFactory( new Vector() );
-	}
-	else
-	{
-	  factory = webService_.deploy( environment_, context_, selection_, module_, ear_ );	
-	}
-	
-	return factory;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/DevelopClientFragment.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/DevelopClientFragment.java
deleted file mode 100644
index fdf9431..0000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/DevelopClientFragment.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.wst.ws.internal.extensions;
-
-import java.util.Vector;
-
-import org.eclipse.wst.command.internal.provisional.ICommandFactory;
-import org.eclipse.wst.command.internal.provisional.SimpleCommandFactory;
-
-public class DevelopClientFragment extends AbstractClientFragment 
-{
-  public DevelopClientFragment()
-  {
-  }
-  
-  protected DevelopClientFragment( DevelopClientFragment fragment )
-  {
-	super( fragment );  
-  }
-  
-  public Object clone() 
-  {
-	return new DevelopClientFragment();
-  }
-
-  public ICommandFactory getICommandFactory() 
-  {
-	ICommandFactory factory = null;
-	
-	if( webServiceClient_ == null )
-	{
-	  factory = new SimpleCommandFactory( new Vector() );
-	}
-	else
-	{
-	  factory = webServiceClient_.develop( environment_, context_, selection_, module_, ear_ );	
-	}
-	
-	return factory;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/DevelopServiceFragment.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/DevelopServiceFragment.java
deleted file mode 100644
index ef1ede6..0000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/DevelopServiceFragment.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.wst.ws.internal.extensions;
-
-import java.util.Vector;
-
-import org.eclipse.wst.command.internal.provisional.ICommandFactory;
-import org.eclipse.wst.command.internal.provisional.SimpleCommandFactory;
-
-public class DevelopServiceFragment extends AbstractServiceFragment 
-{
-  public DevelopServiceFragment()
-  {
-  }
-  
-  protected DevelopServiceFragment( DevelopServiceFragment fragment )
-  {
-	super( fragment );  
-  }
-  
-  public Object clone() 
-  {
-	return new DevelopServiceFragment();
-  }
-
-  public ICommandFactory getICommandFactory() 
-  {
-	ICommandFactory factory = null;
-	
-	if( webService_ == null )
-	{
-	  factory = new SimpleCommandFactory( new Vector() );
-	}
-	else
-	{
-	  factory = webService_.develop( environment_, context_, selection_, module_, ear_ );	
-	}
-	
-	return factory;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/InstallClientFragment.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/InstallClientFragment.java
deleted file mode 100644
index 64545a2..0000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/InstallClientFragment.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.wst.ws.internal.extensions;
-
-import java.util.Vector;
-
-import org.eclipse.wst.command.internal.provisional.ICommandFactory;
-import org.eclipse.wst.command.internal.provisional.SimpleCommandFactory;
-
-public class InstallClientFragment extends AbstractClientFragment 
-{
-  public InstallClientFragment()
-  {
-  }
-  
-  protected InstallClientFragment( InstallClientFragment fragment )
-  {
-	super( fragment );  
-  }
-  
-  public Object clone() 
-  {
-	return new InstallClientFragment();
-  }
-
-  public ICommandFactory getICommandFactory() 
-  {
-	ICommandFactory factory = null;
-	
-	if( webServiceClient_ == null )
-	{
-	  factory = new SimpleCommandFactory( new Vector() );
-	}
-	else
-	{
-	  factory = webServiceClient_.install( environment_, context_, selection_, module_, ear_ );	
-	}
-	
-	return factory;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/InstallServiceFragment.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/InstallServiceFragment.java
deleted file mode 100644
index 53b82f0..0000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/InstallServiceFragment.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.wst.ws.internal.extensions;
-
-import java.util.Vector;
-
-import org.eclipse.wst.command.internal.provisional.ICommandFactory;
-import org.eclipse.wst.command.internal.provisional.SimpleCommandFactory;
-
-public class InstallServiceFragment extends AbstractServiceFragment 
-{
-  public InstallServiceFragment()
-  {
-  }
-  
-  protected InstallServiceFragment( InstallServiceFragment fragment )
-  {
-	super( fragment );  
-  }
-  
-  public Object clone() 
-  {
-	return new InstallServiceFragment();
-  }
-
-  public ICommandFactory getICommandFactory() 
-  {
-	ICommandFactory factory = null;
-	
-	if( webService_ == null )
-	{
-	  factory = new SimpleCommandFactory( new Vector() );
-	}
-	else
-	{
-	  factory = webService_.install( environment_, context_, selection_, module_, ear_ );	
-	}
-	
-	return factory;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/RunClientFragment.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/RunClientFragment.java
deleted file mode 100644
index d7958e3..0000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/RunClientFragment.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.wst.ws.internal.extensions;
-
-import java.util.Vector;
-
-import org.eclipse.wst.command.internal.provisional.ICommandFactory;
-import org.eclipse.wst.command.internal.provisional.SimpleCommandFactory;
-
-public class RunClientFragment extends AbstractClientFragment 
-{
-  public RunClientFragment()
-  {
-  }
-  
-  protected RunClientFragment( RunClientFragment fragment )
-  {
-	super( fragment );  
-  }
-  
-  public Object clone() 
-  {
-	return new RunClientFragment();
-  }
-
-  public ICommandFactory getICommandFactory() 
-  {
-	ICommandFactory factory = null;
-	
-	if( webServiceClient_ == null )
-	{
-	  factory = new SimpleCommandFactory( new Vector() );
-	}
-	else
-	{
-	  factory = webServiceClient_.run( environment_, context_, selection_, module_, ear_ );	
-	}
-	
-	return factory;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/RunServiceFragment.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/RunServiceFragment.java
deleted file mode 100644
index ff517ca..0000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/RunServiceFragment.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.wst.ws.internal.extensions;
-
-import java.util.Vector;
-
-import org.eclipse.wst.command.internal.provisional.ICommandFactory;
-import org.eclipse.wst.command.internal.provisional.SimpleCommandFactory;
-
-public class RunServiceFragment extends AbstractServiceFragment 
-{
-  public RunServiceFragment()
-  {
-  }
-  
-  protected RunServiceFragment( RunServiceFragment fragment )
-  {
-	super( fragment );  
-  }
-  
-  public Object clone() 
-  {
-	return new RunServiceFragment();
-  }
-
-  public ICommandFactory getICommandFactory() 
-  {
-	ICommandFactory factory = null;
-	
-	if( webService_ == null )
-	{
-	  factory = new SimpleCommandFactory( new Vector() );
-	}
-	else
-	{
-	  factory = webService_.run( environment_, context_, selection_, module_, ear_ );	
-	}
-	
-	return factory;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/monitor/GetMonitorCommand.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/monitor/GetMonitorCommand.java
deleted file mode 100644
index 30080f2..0000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/monitor/GetMonitorCommand.java
+++ /dev/null
@@ -1,209 +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.internal.monitor;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Port;
-import javax.wsdl.Service;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.http.HTTPAddress;
-import javax.wsdl.extensions.soap.SOAPAddress;
-
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.command.env.core.common.StatusException;
-import org.eclipse.wst.internet.monitor.core.IMonitor;
-import org.eclipse.wst.internet.monitor.core.IMonitorWorkingCopy;
-import org.eclipse.wst.internet.monitor.core.MonitorCore;
-import org.eclipse.wst.server.core.util.SocketUtil;
-import org.eclipse.wst.ws.WSPlugin;
-import org.eclipse.wst.ws.parser.wsil.WebServicesParser;
-
-public class GetMonitorCommand extends SimpleCommand {
-	private boolean monitorService;
-
-	private boolean create;
-
-	private WebServicesParser webServicesParser;
-
-	private String wsdlURI;
-
-	private List endpoints;
-
-	public GetMonitorCommand() {
-		super(
-				"org.eclipse.jst.ws.internal.consumption.command.common.GetMonitorCommand",
-				"org.eclipse.jst.ws.internal.consumption.command.common.GetMonitorCommand");
-		monitorService = true;
-		create = true;
-	}
-
-	public Status execute(Environment env) {
-		endpoints = new Vector();
-		if (monitorService && webServicesParser != null && wsdlURI != null
-				&& wsdlURI.length() > 0) {
-			Definition definition = webServicesParser
-					.getWSDLDefinition(wsdlURI);
-			if (definition != null) {
-				Map services = definition.getServices();
-				for (Iterator servicesIt = services.values().iterator(); servicesIt
-						.hasNext();) {
-					Service service = (Service) servicesIt.next();
-					Map ports = service.getPorts();
-					for (Iterator portsIt = ports.values().iterator(); portsIt
-							.hasNext();) {
-						Port wsdlPort = (Port) portsIt.next();
-						List extElements = wsdlPort.getExtensibilityElements();
-						for (Iterator extElementsIt = extElements.iterator(); extElementsIt
-								.hasNext();) {
-							ExtensibilityElement extElement = (ExtensibilityElement) extElementsIt
-									.next();
-							String endpoint = null;
-							URL endpointURL = null;
-							if (extElement instanceof SOAPAddress)
-								endpoint = ((SOAPAddress) extElement)
-										.getLocationURI();
-							else if (extElement instanceof HTTPAddress)
-								endpoint = ((HTTPAddress) extElement)
-										.getLocationURI();
-							if (endpoint != null) {
-								try {
-									endpointURL = new URL(endpoint);
-								} catch (MalformedURLException murle) {
-								}
-							}
-							if (endpointURL != null) {
-								String protocol = endpointURL.getProtocol();
-								String host = endpointURL.getHost();
-								int port = endpointURL.getPort();
-								if (port == -1) {
-									if ("http".equalsIgnoreCase(protocol))
-										port = 80;
-									else if ("https".equalsIgnoreCase(protocol))
-										port = 443;
-								}
-								if (protocol != null
-										&& protocol.startsWith("http")
-										&& host != null && host.length() > 0
-										&& port != -1) {
-									IMonitor m = null;
-									IMonitor[] monitors = MonitorCore
-											.getMonitors();
-									for (int i = 0; i < monitors.length; i++) {
-										if (host.equalsIgnoreCase(monitors[i]
-												.getRemoteHost())
-												&& port == monitors[i]
-														.getRemotePort()) {
-											m = monitors[i];
-											break;
-										}
-									}
-									if (m == null && create) {
-										int monitoredPort = SocketUtil
-												.findUnusedPort(5000, 15000);
-										IMonitorWorkingCopy monitorWorkingCopy = MonitorCore
-												.createMonitor();
-										monitorWorkingCopy
-												.setLocalPort(monitoredPort);
-										monitorWorkingCopy.setRemoteHost(host);
-										monitorWorkingCopy.setRemotePort(port);
-										monitorWorkingCopy.setProtocol("HTTP");
-										try {
-											m = monitorWorkingCopy.save();
-										} catch (Throwable t) {
-											Status warning = new SimpleStatus(
-													"org.eclipse.wst.ws",
-													WSPlugin.getResourceString(
-																	"MSG_ERROR_UNABLE_TO_START_MONITOR",
-																	new Object[] {
-																			String
-																					.valueOf(port),
-																			endpoint }),
-													Status.WARNING, t);
-											try {
-												if (env != null)
-													env.getStatusHandler()
-															.report(warning);
-											} catch (StatusException se) {
-											}
-										}
-									}
-									if (m != null) {
-										try {
-											if (!m.isRunning())
-												m.start();
-											StringBuffer sb = new StringBuffer(
-													endpointURL.getProtocol());
-											sb.append("://localhost:");
-											sb.append(String.valueOf(m
-													.getLocalPort()));
-											sb.append(endpointURL.getFile());
-											endpoints.add(sb.toString());
-										} catch (Throwable t) {
-											Status warning = new SimpleStatus(
-													"org.eclipse.wst.ws",
-													WSPlugin.getResourceString(
-																	"MSG_ERROR_UNABLE_TO_START_MONITOR",
-																	new Object[] {
-																			String
-																					.valueOf(port),
-																			endpoint }),
-													Status.WARNING, t);
-											try {
-												if (env != null)
-													env.getStatusHandler()
-															.report(warning);
-											} catch (StatusException se) {
-											}
-										}
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-		return new SimpleStatus("");
-	}
-
-	public void setMonitorService(boolean monitorService) {
-		this.monitorService = monitorService;
-	}
-
-	public void setDefinition(Definition definition) {
-	}
-
-	public void setWebServicesParser(WebServicesParser webServicesParser) {
-		this.webServicesParser = webServicesParser;
-	}
-
-	public void setWsdlURI(String wsdlURI) {
-		this.wsdlURI = wsdlURI;
-	}
-
-	public void setCreate(boolean create) {
-		this.create = create;
-	}
-
-	public List getEndpoints() {
-		return endpoints;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/AbstractWebService.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/AbstractWebService.java
deleted file mode 100644
index ebf91fa..0000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/AbstractWebService.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.ws.internal.provisional.wsrt;
-
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.ICommandFactory;
-
-
-public abstract class AbstractWebService implements IWebService {
-	
-	private WebServiceInfo info;
-
-	public AbstractWebService(WebServiceInfo info) {
-		this.info = info;
-	}
-	
-
-	public WebServiceInfo getWebServiceInfo() {
-		return info;
-	}
-
-	public abstract ICommandFactory assemble(Environment env, IContext ctx, ISelection sel,
-			String module, String ear);
-	
-
-	public abstract ICommandFactory deploy(Environment env, IContext ctx, ISelection sel,
-			String module, String ear);
-	
-
-	public abstract ICommandFactory develop(Environment env, IContext ctx, ISelection sel,
-			String module, String ear);
-		
-
-	public abstract ICommandFactory install(Environment env, IContext ctx, ISelection sel,
-			String module, String ear);
-	
-
-	public abstract ICommandFactory run(Environment env, IContext ctx, ISelection sel,
-			String module, String ear);
-}
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/AbstractWebServiceClient.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/AbstractWebServiceClient.java
deleted file mode 100644
index 04a9bc9..0000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/AbstractWebServiceClient.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.wst.ws.internal.provisional.wsrt;
-
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.ICommandFactory;
-
-
-public abstract class AbstractWebServiceClient implements IWebServiceClient {
-	
-	private WebServiceClientInfo info;
-
-	public AbstractWebServiceClient(WebServiceClientInfo info) {
-		this.info = info;
-	}
-	
-
-	public WebServiceClientInfo getWebServiceClientInfo() {
-		return info;
-	}
-
-	public abstract ICommandFactory assemble(Environment env, IContext ctx, ISelection sel,
-			String module, String ear);
-	
-
-	public abstract ICommandFactory deploy(Environment env, IContext ctx, ISelection sel,
-			String module, String ear);
-	
-
-	public abstract ICommandFactory develop(Environment env, IContext ctx, ISelection sel,
-			String module, String ear);
-		
-
-	public abstract ICommandFactory install(Environment env, IContext ctx, ISelection sel,
-			String module, String ear);
-	
-
-	public abstract ICommandFactory run(Environment env, IContext ctx, ISelection sel,
-			String module, String ear);
-}
-
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/AbstractWebServiceRuntime.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/AbstractWebServiceRuntime.java
deleted file mode 100644
index 7fa2fe0..0000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/AbstractWebServiceRuntime.java
+++ /dev/null
@@ -1,29 +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.provisional.wsrt;
-
-import org.eclipse.wst.command.internal.provisional.ICommandFactory;
-
-public abstract class AbstractWebServiceRuntime implements IWebServiceRuntime {
-
-	public abstract IWebService getWebService(WebServiceInfo info);
-	/**
-	 */
-	public abstract IWebServiceClient getWebServiceClient(WebServiceClientInfo info);
-	/**
-	 */
-	public ICommandFactory announce(IWebService webService)
-	{
-		//TODO provide a boiler-plate announce implementation.
-		return null;
-	}
-}
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/IContext.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/IContext.java
deleted file mode 100644
index f546a81..0000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/IContext.java
+++ /dev/null
@@ -1,40 +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.provisional.wsrt;
-
-public interface IContext {
-	
-	public boolean getAssemble();
-	
-	public boolean getCheckOutFiles();
-	
-	public boolean getClient();
-	
-	public boolean getCreateFolders();
-	
-	public boolean getDeploy();
-	
-	public boolean getDevelop();
-	
-	public boolean getInstall();
-	
-	public boolean getOverWriteFiles();
-	
-	public boolean getPublish();
-	
-	public boolean getRun();
-	
-	public WebServiceScenario getScenario();
-	
-	public boolean getTest();
-
-}
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/ISelection.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/ISelection.java
deleted file mode 100644
index 7672f19..0000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/ISelection.java
+++ /dev/null
@@ -1,18 +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.provisional.wsrt;
-
-public interface ISelection {
-	
-	Object[] getSelection();
-
-}
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/IWebService.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/IWebService.java
deleted file mode 100644
index 1608e2e..0000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/IWebService.java
+++ /dev/null
@@ -1,29 +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.provisional.wsrt;
-
-
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.ICommandFactory;
-
-
-public interface IWebService {
-
-	/**
-	 */
-	public WebServiceInfo getWebServiceInfo();
-	
-	public ICommandFactory develop(Environment env, IContext ctx, ISelection sel, String module, String ear);
-	public ICommandFactory deploy(Environment env, IContext ctx, ISelection sel, String module, String ear);
-	public ICommandFactory assemble(Environment env, IContext ctx, ISelection sel, String module, String ear);
-	public ICommandFactory install(Environment env, IContext ctx, ISelection sel, String module, String ear);
-	public ICommandFactory run(Environment env, IContext ctx, ISelection sel, String module, String ear);
-}
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/IWebServiceClient.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/IWebServiceClient.java
deleted file mode 100644
index d433ce4..0000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/IWebServiceClient.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.provisional.wsrt;
-
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.ICommandFactory;
-
-public interface IWebServiceClient {
-	
-	/**
-	 */
-	public WebServiceClientInfo getWebServiceClientInfo();
-	
-	public ICommandFactory develop(Environment env, IContext ctx, ISelection sel, String module, String ear);
-	public ICommandFactory deploy(Environment env, IContext ctx, ISelection sel, String module, String ear);
-	public ICommandFactory assemble(Environment env, IContext ctx, ISelection sel, String module, String ear);
-	public ICommandFactory install(Environment env, IContext ctx, ISelection sel, String module, String ear);
-	public ICommandFactory run(Environment env, IContext ctx, ISelection sel, String module, String ear);	
-
-}
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/IWebServicePublisher.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/IWebServicePublisher.java
deleted file mode 100644
index 1ca4720..0000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/IWebServicePublisher.java
+++ /dev/null
@@ -1,20 +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.provisional.wsrt;
-
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.ICommandFactory;
-
-public interface IWebServicePublisher {
-	
-	public ICommandFactory publish(Environment env, IWebService ws);
-
-}
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/IWebServiceRuntime.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/IWebServiceRuntime.java
deleted file mode 100644
index 25cc8cf..0000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/IWebServiceRuntime.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.provisional.wsrt;
-
-import org.eclipse.wst.command.internal.provisional.ICommandFactory;
-
-
-public interface IWebServiceRuntime {
-	
-	/**
-	 */
-	public IWebService getWebService(WebServiceInfo info);
-	/**
-	 */
-	public IWebServiceClient getWebServiceClient(WebServiceClientInfo info);
-	/**
-	 */
-	public ICommandFactory announce(IWebService webService);
-
-}
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/IWebServiceTester.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/IWebServiceTester.java
deleted file mode 100644
index c6631d4..0000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/IWebServiceTester.java
+++ /dev/null
@@ -1,20 +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.provisional.wsrt;
-
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.ICommandFactory;
-
-public interface IWebServiceTester {
-
-	public ICommandFactory generate(Environment env, IContext ctx, ISelection sel, String module, String ear);
-	public ICommandFactory launch(Environment env, IContext ctx, ISelection sel, String module, String ear);
-}
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/WebServiceClientInfo.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/WebServiceClientInfo.java
deleted file mode 100644
index 29b779f..0000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/WebServiceClientInfo.java
+++ /dev/null
@@ -1,73 +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.provisional.wsrt;
-
-public class WebServiceClientInfo {
-
-	private WebServiceState state;
-	private java.lang.String servletLevel;
-	private java.lang.String j2eeLevel;
-	private java.lang.String serverFactoryId;
-	private java.lang.String serverInstanceId;
-	private java.lang.String webServiceRuntimeId;
-	private java.lang.String wsdlURL;
-	private java.lang.String implURL;
-	
-	public java.lang.String getImplURL() {
-		return implURL;
-	}
-	public void setImplURL(java.lang.String implURL) {
-		this.implURL = implURL;
-	}
-	public java.lang.String getJ2eeLevel() {
-		return j2eeLevel;
-	}
-	public void setJ2eeLevel(java.lang.String level) {
-		j2eeLevel = level;
-	}
-	public java.lang.String getServerFactoryId() {
-		return serverFactoryId;
-	}
-	public void setServerFactoryId(java.lang.String serverFactoryId) {
-		this.serverFactoryId = serverFactoryId;
-	}
-	public java.lang.String getServerInstanceId() {
-		return serverInstanceId;
-	}
-	public void setServerInstanceId(java.lang.String serverInstanceId) {
-		this.serverInstanceId = serverInstanceId;
-	}
-	public java.lang.String getServletLevel() {
-		return servletLevel;
-	}
-	public void setServletLevel(java.lang.String servletLevel) {
-		this.servletLevel = servletLevel;
-	}
-	public WebServiceState getState() {
-		return state;
-	}
-	public void setState(WebServiceState state) {
-		this.state = state;
-	}
-	public java.lang.String getWebServiceRuntimeId() {
-		return webServiceRuntimeId;
-	}
-	public void setWebServiceRuntimeId(java.lang.String webServiceRuntimeId) {
-		this.webServiceRuntimeId = webServiceRuntimeId;
-	}
-	public java.lang.String getWsdlURL() {
-		return wsdlURL;
-	}
-	public void setWsdlURL(java.lang.String wsdlURL) {
-		this.wsdlURL = wsdlURL;
-	}
-}
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/WebServiceInfo.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/WebServiceInfo.java
deleted file mode 100644
index 2657c2c..0000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/WebServiceInfo.java
+++ /dev/null
@@ -1,99 +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.provisional.wsrt;
-
-public class WebServiceInfo {
-
-	private WebServiceState state;
-	private java.lang.String servletLevel;
-	private java.lang.String j2eeLevel;
-	private java.lang.String serverFactoryId;
-	private java.lang.String serverInstanceId;
-	private java.lang.String webServiceRuntimeId;
-	private java.lang.String wsdlURL;
-	private java.lang.String endPointURL;
-	private java.lang.String implURL;
-	public java.lang.String getEndPointURL()
-	{
-		return endPointURL;
-	}
-	public void setEndPointURL(java.lang.String endPointURL)
-	{
-		this.endPointURL = endPointURL;
-	}
-	public java.lang.String getImplURL()
-	{
-		return implURL;
-	}
-	public void setImplURL(java.lang.String implURL)
-	{
-		this.implURL = implURL;
-	}
-	public java.lang.String getJ2eeLevel()
-	{
-		return j2eeLevel;
-	}
-	public void setJ2eeLevel(java.lang.String level)
-	{
-		j2eeLevel = level;
-	}
-	public java.lang.String getServerFactoryId()
-	{
-		return serverFactoryId;
-	}
-	public void setServerFactoryId(java.lang.String serverFactoryId)
-	{
-		this.serverFactoryId = serverFactoryId;
-	}
-	public java.lang.String getServerInstanceId()
-	{
-		return serverInstanceId;
-	}
-	public void setServerInstanceId(java.lang.String serverInstanceId)
-	{
-		this.serverInstanceId = serverInstanceId;
-	}
-	public java.lang.String getServletLevel()
-	{
-		return servletLevel;
-	}
-	public void setServletLevel(java.lang.String servletLevel)
-	{
-		this.servletLevel = servletLevel;
-	}
-	public WebServiceState getState()
-	{
-		return state;
-	}
-	public void setState(WebServiceState state)
-	{
-		this.state = state;
-	}
-	public java.lang.String getWebServiceRuntimeId()
-	{
-		return webServiceRuntimeId;
-	}
-	public void setWebServiceRuntimeId(java.lang.String webServiceRuntimeId)
-	{
-		this.webServiceRuntimeId = webServiceRuntimeId;
-	}
-	public java.lang.String getWsdlURL()
-	{
-		return wsdlURL;
-	}
-	public void setWsdlURL(java.lang.String wsdlURL)
-	{
-		this.wsdlURL = wsdlURL;
-	}
-	
-	
-}
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/WebServiceScenario.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/WebServiceScenario.java
deleted file mode 100644
index 5e44d8b..0000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/WebServiceScenario.java
+++ /dev/null
@@ -1,80 +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.provisional.wsrt;
-
-import java.util.List;
-import java.util.Arrays;
-import java.util.Collections;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-
-public final class WebServiceScenario extends AbstractEnumerator
-{
-
-  public static final int BOTTOMUP = 0;
-  public static final int TOPDOWN = 1;
-  public static final int CLIENT = 2;
-  
-  
-  public static final WebServiceScenario BOTTOMUP_LITERAL = new WebServiceScenario(BOTTOMUP, "BOTTOMUP");
-  public static final WebServiceScenario TOPDOWN_LITERAL = new WebServiceScenario(TOPDOWN, "TOPDOWN");
-  public static final WebServiceScenario CLIENT_LITERAL = new WebServiceScenario(CLIENT, "CLIENT");
-
-
-  private static final WebServiceScenario[] VALUES_ARRAY =
-    new WebServiceScenario[]
-    {
-	  BOTTOMUP_LITERAL,
-	  TOPDOWN_LITERAL,
-	  CLIENT_LITERAL,
-    };
-
-  public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-
-  public static WebServiceScenario get(String name)
-  {
-    for (int i = 0; i < VALUES_ARRAY.length; ++i)
-    {
-      WebServiceScenario result = VALUES_ARRAY[i];
-      if (result.toString().equals(name))
-      {
-        return result;
-      }
-    }
-    return null;
-  }
-
-
-  public static WebServiceScenario get(int value)
-  {
-    switch (value)
-    {
-      case BOTTOMUP: return BOTTOMUP_LITERAL;
-      case TOPDOWN: return TOPDOWN_LITERAL;
-      case CLIENT: return CLIENT_LITERAL;
-    }
-    return null;	
-  }
-
-  /**
-   * Only this class can construct instances.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private WebServiceScenario(int value, String name)
-  {
-    super(value, name);
-  }
-
-} //WebServiceScenario
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/WebServiceState.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/WebServiceState.java
deleted file mode 100644
index 913eda9..0000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/WebServiceState.java
+++ /dev/null
@@ -1,92 +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.provisional.wsrt;
-
-import java.util.List;
-import java.util.Arrays;
-import java.util.Collections;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-
-public final class WebServiceState extends AbstractEnumerator
-{
-
-  public static final int UNKNOWN = 0;
-  public static final int DEVELOPED = 1;
-  public static final int ASSEMBLED = 2;
-  public static final int DEPLOYED = 3;
-  public static final int INSTALLED = 4;
-  public static final int RUNNING = 5;
-  
-  
-  public static final WebServiceState UNKNOWN_LITERAL = new WebServiceState(UNKNOWN, "UNKNOWN");
-  public static final WebServiceState DEVELOPED_LITERAL = new WebServiceState(DEVELOPED, "DEVELOPED");
-  public static final WebServiceState ASSEMBLED_LITERAL = new WebServiceState(ASSEMBLED, "ASSEMBLED");
-  public static final WebServiceState DEPLOYED_LITERAL = new WebServiceState(DEPLOYED, "DEPLOYED");
-  public static final WebServiceState INSTALLED_LITERAL = new WebServiceState(INSTALLED, "INSTALLED");
-  public static final WebServiceState RUNNING_LITERAL = new WebServiceState(RUNNING, "RUNNING");
-
-  private static final WebServiceState[] VALUES_ARRAY =
-    new WebServiceState[]
-    {
-	  UNKNOWN_LITERAL,
-	  DEVELOPED_LITERAL,
-	  ASSEMBLED_LITERAL,
-	  DEPLOYED_LITERAL,
-	  INSTALLED_LITERAL,
-	  RUNNING_LITERAL,
-    };
-
-  public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-
-  public static WebServiceState get(String name)
-  {
-    for (int i = 0; i < VALUES_ARRAY.length; ++i)
-    {
-      WebServiceState result = VALUES_ARRAY[i];
-      if (result.toString().equals(name))
-      {
-        return result;
-      }
-    }
-    return null;
-  }
-
-
-  public static WebServiceState get(int value)
-  {
-    switch (value)
-    {
-      case UNKNOWN: return UNKNOWN_LITERAL;
-      case DEVELOPED: return DEVELOPED_LITERAL;
-      case ASSEMBLED: return ASSEMBLED_LITERAL;
-	  case DEPLOYED: return DEPLOYED_LITERAL;
-	  case INSTALLED: return INSTALLED_LITERAL;
-	  case RUNNING: return RUNNING_LITERAL;
-    }
-    return null;	
-  }
-
-  /**
-   * Only this class can construct instances.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private WebServiceState(int value, String name)
-  {
-    super(value, name);
-  }
-
-} //WebServiceState
-
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsil/AddWSDLToWSILCommand.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsil/AddWSDLToWSILCommand.java
deleted file mode 100644
index c51875c..0000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsil/AddWSDLToWSILCommand.java
+++ /dev/null
@@ -1,540 +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.internal.wsil;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.ResourceBundle;
-
-import javax.wsdl.Definition;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import org.apache.wsil.Abstract;
-import org.apache.wsil.Description;
-import org.apache.wsil.Inspection;
-import org.apache.wsil.QName;
-import org.apache.wsil.Service;
-import org.apache.wsil.WSILDocument;
-import org.apache.wsil.WSILException;
-import org.apache.wsil.extension.ExtensionBuilder;
-import org.apache.wsil.extension.wsdl.ImplementedBinding;
-import org.apache.wsil.extension.wsdl.Reference;
-import org.apache.wsil.extension.wsdl.ReferencedService;
-import org.apache.wsil.extension.wsdl.WSDLConstants;
-import org.apache.wsil.xml.XMLWriter;
-import org.eclipse.wst.command.env.core.SimpleCommand;
-import org.eclipse.wst.command.env.core.common.Environment;
-import org.eclipse.wst.command.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.env.core.common.Status;
-import org.eclipse.wst.command.env.core.uri.URIException;
-import org.eclipse.wst.command.env.core.uri.URIFactory;
-import org.eclipse.wst.ws.parser.wsil.IllegalArgumentsException;
-import org.eclipse.wst.ws.parser.wsil.WWWAuthenticationException;
-import org.eclipse.wst.ws.parser.wsil.WWWAuthenticationHandler;
-import org.eclipse.wst.ws.parser.wsil.WebServicesParser;
-import org.w3c.dom.Element;
-import org.xml.sax.SAXException;
-
-public class AddWSDLToWSILCommand extends SimpleCommand
-{
-  public static final String ARG_WSIL = "-wsil";
-  public static final String ARG_WSDL = "-wsdl";
-  public static final String ARG_RESOLVE_WSDL = "-resolvewsdl";
-  public static final String ARG_HTTP_BASIC_AUTH_USERNAME = "-httpusername";
-  public static final String ARG_HTTP_BASIC_AUTH_PASSWORD = "-httppassword";
-  private final String id = "org.eclipse.wst.ws.parser.wsil.AddWSDLToWSILCommand";
-  private ResourceBundle resBundle_;
-  private WWWAuthenticationHandler wwwAuthHandler_;
-  private String[] args_;
-  private String wsil_;
-  private ArrayList wsdls_;
-  private boolean resolveWSDL_;
-  private String httpUsername_;
-  private String httpPassword_;
-
-  public AddWSDLToWSILCommand()
-  {
-    super("org.eclipse.wst.ws.parser.wsil.AddWSDLToWSILCommand", "org.eclipse.wst.ws.parser.wsil.AddWSDLToWSILCommand");
-    resBundle_ = ResourceBundle.getBundle("org.eclipse.wst.ws.parser.wsil.wsil");
-    wwwAuthHandler_ = null;
-    args_ = new String[0];
-    clearParsedArgs();
-  }
-
-  private void clearParsedArgs()
-  {
-    wsil_ = null;
-    if (wsdls_ == null)
-      wsdls_ = new ArrayList();
-    else
-      wsdls_.clear();
-    resolveWSDL_ = false;
-    httpUsername_ = null;
-    httpPassword_ = null;
-  }
-
-  /**
-   * Executes the Command.
-   * 
-   * @param environment
-   *            The environment. Must not be null.
-   * @return A <code>Status</code> object indicating the degree to which the
-   *         <code>execute</code> method was successful. A valud of <code>null</code>,
-   *         or a Status with a severity of less than <code>Status.ERROR</code>
-   *         signifies success.
-   */
-  public Status execute(Environment environment)
-  {
-    URIFactory uriFactory = environment.getURIFactory();
-    // Parse arguments
-    try
-    {
-      parseArguments();
-    }
-    catch (IllegalArgumentsException iae)
-    {
-      return new SimpleStatus(id, resBundle_.getString("MSG_ERROR_ILLEGAL_ARGUMENTS"), Status.ERROR, iae);
-    }
-    catch (ArrayIndexOutOfBoundsException e)
-    {
-      return new SimpleStatus(id, resBundle_.getString("MSG_ERROR_INVALID_ARGUMENTS"), Status.ERROR, e);
-    }
-    // Create new WSIL document
-    WSILDocument wsilDocument = null;
-    URL wsilURL = null;
-    try
-    {
-      wsilDocument = WSILDocument.newInstance();
-      wsilURL = new URL(wsil_);
-    }
-    catch (MalformedURLException murle)
-    {
-      Status status = new SimpleStatus(id, resBundle_.getString("MSG_ERROR_INVALID_WSIL_URI"), Status.ERROR, murle);
-      environment.getStatusHandler().reportError(status);
-      return status;
-    }
-    catch (WSILException wsile)
-    {
-      Status status = new SimpleStatus(id, resBundle_.getString("MSG_ERROR_UNEXPECTED_EXCEPTION"), Status.ERROR, wsile);
-      environment.getStatusHandler().reportError(status);
-      return status;
-    }
-    // Read WSIL
-    try
-    {
-      InputStream is = uriFactory.newURI(wsilURL).getInputStream();
-      if (is != null)
-      {
-        wsilDocument.read(new InputStreamReader(is));
-        is.close();
-      }
-    }
-    catch (URIException urie)
-    {
-      Status status = new SimpleStatus(id, resBundle_.getString("MSG_ERROR_UNEXPECTED_EXCEPTION"), Status.ERROR, urie);
-      environment.getStatusHandler().reportError(status);
-      return status;
-    }
-    catch (IOException ioe)
-    {
-      Status status = new SimpleStatus(id, resBundle_.getString("MSG_ERROR_UNEXPECTED_EXCEPTION"), Status.ERROR, ioe);
-      environment.getStatusHandler().reportError(status);
-      return status;
-    }
-    catch (WSILException wsile)
-    {
-      Status status = new SimpleStatus(id, resBundle_.getString("MSG_ERROR_UNEXPECTED_EXCEPTION"), Status.ERROR, wsile);
-      environment.getStatusHandler().reportError(status);
-      return status;
-    }
-    // internalExecute
-    String httpUsername = null;
-    String httpPassword = null;
-    if (wsdls_.size() == 1 && httpUsername_ != null && httpPassword_ != null)
-    {
-      httpUsername = httpUsername_;
-      httpPassword = httpPassword_;
-    }
-    for (Iterator it = wsdls_.iterator(); it.hasNext();)
-    {
-      String wsdl = (String) it.next();
-      Status status = null;
-      try
-      {
-        status = internalExecute(environment, wsilDocument, platform2File(uriFactory, wsil_), wsdl, httpUsername, httpPassword);
-      }
-      catch (WWWAuthenticationException wwwae)
-      {
-        if (wwwAuthHandler_ != null && httpUsername == null && httpPassword == null)
-        {
-          wwwAuthHandler_.handleWWWAuthentication(wwwae);
-          String handlerUsername = wwwAuthHandler_.getUsername();
-          String handlerPassword = wwwAuthHandler_.getPassword();
-          if (handlerUsername != null && handlerPassword != null)
-          {
-            try
-            {
-              status = internalExecute(environment, wsilDocument, platform2File(uriFactory, wsil_), wsdl, handlerUsername, handlerPassword);
-            }
-            catch (WWWAuthenticationException wwwae2)
-            {
-              Status wwwaeStatus = new SimpleStatus(id, resBundle_.getString("MSG_ERROR_UNRESOLVABLE_WSDL"), Status.ERROR, wwwae2.getIOException());
-              environment.getStatusHandler().reportError(wwwaeStatus);
-              return wwwaeStatus;
-            }
-          }
-        }
-        if (status == null)
-        {
-          Status s = new SimpleStatus(id, resBundle_.getString("MSG_ERROR_UNRESOLVABLE_WSDL"), Status.ERROR, wwwae.getIOException());
-          environment.getStatusHandler().reportError(s);
-          return s;
-        }
-      }
-      if (status.getSeverity() != Status.OK)
-        return status;
-    }
-    // Write WSIL
-    try
-    {
-      XMLWriter xmlWriter = new XMLWriter();
-      OutputStream os = uriFactory.newURI(wsilURL).getOutputStream();
-      if (os != null)
-        xmlWriter.writeDocument(wsilDocument, os);
-      else
-        throw new IOException();
-      os.close();
-    }
-    catch (URIException urie)
-    {
-      Status status = new SimpleStatus(id, resBundle_.getString("MSG_ERROR_WRITE_WSIL"), Status.ERROR, urie);
-      environment.getStatusHandler().reportError(status);
-      return status;
-    }
-    catch (IOException ioe)
-    {
-      Status status = new SimpleStatus(id, resBundle_.getString("MSG_ERROR_WRITE_WSIL"), Status.ERROR, ioe);
-      environment.getStatusHandler().reportError(status);
-      return status;
-    }
-    catch (WSILException wsile)
-    {
-      Status status = new SimpleStatus(id, resBundle_.getString("MSG_ERROR_WRITE_WSIL"), Status.ERROR, wsile);
-      environment.getStatusHandler().reportError(status);
-      return status;
-    }
-    return new SimpleStatus(id, "", Status.OK, null);
-  }
-
-  private Status internalExecute(Environment environment, WSILDocument wsilDocument, String wsil, String wsdl, String httpUsername, String httpPassword) throws WWWAuthenticationException
-  {
-    Definition definition = null;
-    ArrayList wsdlService = new ArrayList();
-    ArrayList wsdlBinding = new ArrayList();
-    if (resolveWSDL_)
-    {
-      // Parse WSDL
-      try
-      {
-        definition = parseWSDL(wsdl, wsdlService, wsdlBinding, httpUsername, httpPassword);
-      }
-      catch (MalformedURLException murle)
-      {
-        Status status = new SimpleStatus(id, resBundle_.getString("MSG_ERROR_INVALID_WSDL_URI"), Status.ERROR, murle);
-        environment.getStatusHandler().reportError(status);
-        return status;
-      }
-      catch (IOException ioe)
-      {
-        Status status = new SimpleStatus(id, resBundle_.getString("MSG_ERROR_UNRESOLVABLE_WSDL"), Status.ERROR, ioe);
-        environment.getStatusHandler().reportError(status);
-        return status;
-      }
-      catch (ParserConfigurationException pce)
-      {
-        Status status = new SimpleStatus(id, resBundle_.getString("MSG_ERROR_UNEXPECTED_EXCEPTION"), Status.ERROR, pce);
-        environment.getStatusHandler().reportError(status);
-        return status;
-      }
-      catch (SAXException saxe)
-      {
-        Status status = new SimpleStatus(id, resBundle_.getString("MSG_ERROR_MALFORMED_WSDL"), Status.ERROR, saxe);
-        environment.getStatusHandler().reportError(status);
-        return status;
-      }
-    }
-    // Add WSDL to WSIL
-    try
-    {
-      Inspection inspection = wsilDocument.getInspection();
-      Service service = wsilDocument.createService();
-      if (definition != null)
-      {
-        Element documentation = definition.getDocumentationElement();
-        Abstract serviceAbstract = wsilDocument.createAbstract();
-        serviceAbstract.setText(Element2String(documentation));
-        service.addAbstract(serviceAbstract);
-      }
-      Description desc = wsilDocument.createDescription();
-      desc.setReferencedNamespace(WSDLConstants.NS_URI_WSDL);
-      desc.setLocation(getRelativeURI(wsil, wsdl));
-      ExtensionBuilder extBuilder = wsilDocument.getExtensionRegistry().getBuilder(WSDLConstants.NS_URI_WSIL_WSDL);
-      if (definition == null || endpointPresent(definition))
-      {
-        for (Iterator it = wsdlService.iterator(); it.hasNext();)
-        {
-          Reference reference = (Reference) extBuilder.createElement(new QName(WSDLConstants.NS_URI_WSIL_WSDL, WSDLConstants.ELEM_REFERENCE));
-          reference.setEndpointPresent(new Boolean(true));
-          ReferencedService refService = (ReferencedService) extBuilder.createElement(new QName(WSDLConstants.NS_URI_WSIL_WSDL, WSDLConstants.ELEM_REF_SERVICE));
-          refService.setReferencedServiceName((QName) it.next());
-          reference.setReferencedService(refService);
-          desc.setExtensionElement(reference);
-        }
-      }
-      else
-      {
-        Reference reference = (Reference) extBuilder.createElement(new QName(WSDLConstants.NS_URI_WSIL_WSDL, WSDLConstants.ELEM_REFERENCE));
-        reference.setEndpointPresent(new Boolean(false));
-        for (Iterator it = wsdlBinding.iterator(); it.hasNext();)
-        {
-          ImplementedBinding binding = (ImplementedBinding) extBuilder.createElement(new QName(WSDLConstants.NS_URI_WSIL_WSDL, WSDLConstants.ELEM_IMPL_BINDING));
-          binding.setBindingName((QName) it.next());
-          reference.addImplementedBinding(binding);
-        }
-      }
-      service.addDescription(desc);
-      inspection.addService(service);
-    }
-    catch (WSILException wsile)
-    {
-      Status status = new SimpleStatus(id, resBundle_.getString("MSG_ERROR_UNEXPECTED_EXCEPTION"), Status.ERROR, wsile);
-      environment.getStatusHandler().reportError(status);
-      return status;
-    }
-    catch (Throwable t)
-    {
-      Status status = new SimpleStatus(id, resBundle_.getString("MSG_ERROR_UNEXPECTED_EXCEPTION"), Status.ERROR, t);
-      environment.getStatusHandler().reportError(status);
-      return status;
-    }
-    return new SimpleStatus(id, "", Status.OK, null);
-  }
-
-  /**
-   * Returns <code>true</code> if, and only if, the Command's <code>undo</code>
-   * method is supported.
-   * 
-   * @return True if the Command supports being undone.
-   */
-  public boolean isUndoable()
-  {
-    return false;
-  }
-
-  /**
-   * Undoes the Command.
-   * 
-   * @param environment
-   *            The environment. Must not be null.
-   * @return A <code>Status</code> object indicating the degree to which the
-   *         <code>undo</code> method was successful. A valud of <code>null</code>,
-   *         or a Status with a severity of less than <code>Status.ERROR</code>
-   *         signifies success.
-   */
-  public Status undo(Environment environment)
-  {
-    return new SimpleStatus(id, "", Status.OK, null);
-  }
-
-  /**
-   * Re-executes the Command.
-   * 
-   * @param environment
-   *            The environment. Must not be null.
-   * @return A <code>Status</code> object indicating the degree to which the
-   *         <code>redo</code> method was successful. A value of <code>null</code>,
-   *         or a Status with a severity of less then <code>Status.ERROR</code>
-   *         signifies success.
-   */
-  public Status redo(Environment environment)
-  {
-    return execute(environment);
-  }
-
-  private Definition parseWSDL(String wsdl, ArrayList wsdlService, ArrayList wsdlBinding, String httpUsername, String httpPassword) throws MalformedURLException, IOException, ParserConfigurationException, SAXException, WWWAuthenticationException
-  {
-    WebServicesParser wsParser = new WebServicesParser(wsdl);
-    if (httpUsername != null && httpPassword != null)
-    {
-      wsParser.setHTTPBasicAuthUsername(httpUsername);
-      wsParser.setHTTPBasicAuthPassword(httpPassword);
-    }
-    wsParser.parse(WebServicesParser.PARSE_NONE);
-    Definition definition = wsParser.getWSDLDefinition(wsdl);
-    if (definition != null)
-    {
-      Map services = definition.getServices();
-      for (Iterator it = services.keySet().iterator(); it.hasNext();)
-        wsdlService.add(parseQName((javax.xml.namespace.QName) it.next()));
-      Map bindings = definition.getBindings();
-      for (Iterator it = bindings.keySet().iterator(); it.hasNext();)
-        wsdlBinding.add(parseQName((javax.xml.namespace.QName) it.next()));
-    }
-    return definition;
-  }
-
-  private boolean endpointPresent(Definition definition)
-  {
-    return (definition.getServices().size() > 0);
-  }
-
-  public String[] getArguments()
-  {
-    return args_;
-  }
-
-  public void setArguments(String[] args)
-  {
-    args_ = args;
-  }
-
-  public WWWAuthenticationHandler getWWWAuthenticationHandler()
-  {
-    return wwwAuthHandler_;
-  }
-
-  public void setWWWAuthenticationHandler(WWWAuthenticationHandler wwwAuthHandler)
-  {
-    wwwAuthHandler_ = wwwAuthHandler;
-  }
-
-  private void parseArguments() throws IllegalArgumentsException
-  {
-    clearParsedArgs();
-    for (int i = 0; i < args_.length; i++)
-    {
-      if (ARG_WSIL.equals(args_[i]))
-        wsil_ = args_[++i];
-      else if (ARG_WSDL.equals(args_[i]))
-        wsdls_.add(args_[++i]);
-      else if (ARG_RESOLVE_WSDL.equals(args_[i]))
-        resolveWSDL_ = true;
-      else if (ARG_HTTP_BASIC_AUTH_USERNAME.equals(args_[i]))
-        httpUsername_ = args_[++i];
-      else if (ARG_HTTP_BASIC_AUTH_PASSWORD.equals(args_[i]))
-        httpPassword_ = args_[++i];
-      else
-        throw new IllegalArgumentsException(args_[i]);
-    }
-  }
-
-  private QName parseQName(String qnameString)
-  {
-    int colonIndex = qnameString.indexOf(':');
-    String ns = (colonIndex != -1) ? qnameString.substring(0, colonIndex) : "";
-    String localpart = (colonIndex != -1) ? qnameString.substring(colonIndex + 1, qnameString.length()) : qnameString;
-    return new QName(ns, localpart);
-  }
-
-  private QName parseQName(javax.xml.namespace.QName qname)
-  {
-    return new QName(qname.getNamespaceURI(), qname.getLocalPart());
-  }
-
-  private String Element2String(Element e) throws TransformerConfigurationException, TransformerException, IOException
-  {
-    byte[] b = new byte[0];
-    if (e != null)
-    {
-      DOMSource domSource = new DOMSource(e);
-      Transformer serializer = TransformerFactory.newInstance().newTransformer();
-      serializer.setOutputProperty(OutputKeys.INDENT, "yes");
-      serializer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "2");
-      ByteArrayOutputStream baos = new ByteArrayOutputStream();
-      serializer.transform(domSource, new StreamResult(baos));
-      baos.close();
-      b = baos.toByteArray();
-    }
-    return new String(b);
-  }
-
-  private String platform2File(URIFactory uriFactory, String uri)
-  {
-    try
-    {
-      return uriFactory.newURI(uri).asFile().toURL().toString();
-    }
-    catch (Throwable t)
-    {
-      t.printStackTrace();
-    }
-    return uri;
-  }
-
-  private final char FWD_SLASH = '/';
-  private final char BWD_SLASH = '\\';
-  private final String parentDir = "../";
-
-  private String getRelativeURI(String baseURI, String targetURI)
-  {
-    try
-    {
-      String baseURICopy = baseURI.replace(BWD_SLASH, FWD_SLASH);
-      String targetURICopy = targetURI.replace(BWD_SLASH, FWD_SLASH);
-      int matchingIndex = -1;
-      int index = targetURICopy.indexOf(FWD_SLASH);
-      while (index != -1)
-      {
-        if (baseURICopy.startsWith(targetURICopy.substring(0, index + 1)))
-        {
-          matchingIndex = index;
-          index = targetURICopy.indexOf(FWD_SLASH, index + 1);
-        }
-        else
-          break;
-      }
-      if (matchingIndex != -1)
-      {
-        int slashCount = -1;
-        int fromIndex = matchingIndex;
-        while (fromIndex != -1)
-        {
-          slashCount++;
-          fromIndex = baseURICopy.indexOf(FWD_SLASH, fromIndex + 1);
-        }
-        StringBuffer relativeURI = new StringBuffer();
-        for (int i = 0; i < slashCount; i++)
-          relativeURI.append(parentDir);
-        relativeURI.append(targetURI.substring(matchingIndex + 1, targetURI.length()));
-        return relativeURI.toString();
-      }
-    }
-    catch (Throwable t)
-    {
-    }
-    return targetURI;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/SimpleContext.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/SimpleContext.java
deleted file mode 100644
index fe0626b..0000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/SimpleContext.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package org.eclipse.wst.ws.internal.wsrt;
-
-import org.eclipse.wst.ws.internal.provisional.wsrt.IContext;
-import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceScenario;
-
-public class SimpleContext implements IContext {
-
-	boolean develop;
-	boolean assemble;
-	boolean deploy;
-	boolean install;
-	boolean run;
-	boolean client;
-	boolean test;
-	boolean publish;
-	
-	WebServiceScenario scenario;
-	
-	boolean overwriteFiles;
-	boolean createFolders;
-	boolean checkOutFiles;
-	
-	
-	
-	
-	public SimpleContext()
-	{
-		super();
-		// TODO Auto-generated constructor stub
-	}
-
-	public SimpleContext(boolean develop, boolean assemble, boolean deploy, boolean install, boolean run, boolean client, boolean test, boolean publish, WebServiceScenario scenario, boolean overwriteFiles, boolean folders, boolean checkOutFiles) {
-		super();		
-		this.develop = develop;
-		this.assemble = assemble;
-		this.deploy = deploy;
-		this.install = install;
-		this.run = run;
-		this.client = client;
-		this.test = test;
-		this.publish = publish;
-		this.scenario = scenario;
-		this.overwriteFiles = overwriteFiles;
-		this.createFolders = folders;
-		this.checkOutFiles = checkOutFiles;
-	}
-	
-	public boolean getAssemble() {
-		return assemble;
-	}
-	public void setAssemble(boolean assemble) {
-		this.assemble = assemble;
-	}
-	public boolean getCheckOutFiles() {
-		return checkOutFiles;
-	}
-	public void setCheckOutFiles(boolean checkOutFiles) {
-		this.checkOutFiles = checkOutFiles;
-	}
-	public boolean getClient() {
-		return client;
-	}
-	public void setClient(boolean client) {
-		this.client = client;
-	}
-	public boolean getCreateFolders() {
-		return createFolders;
-	}
-	public void setCreateFolders(boolean createFolders) {
-		this.createFolders = createFolders;
-	}
-	public boolean getDeploy() {
-		return deploy;
-	}
-	public void setDeploy(boolean deploy) {
-		this.deploy = deploy;
-	}
-	public boolean getDevelop() {
-		return develop;
-	}
-	public void setDevelop(boolean develop) {
-		this.develop = develop;
-	}
-	public boolean getInstall() {
-		return install;
-	}
-	public void setInstall(boolean install) {
-		this.install = install;
-	}
-	public boolean getOverWriteFiles() {
-		return overwriteFiles;
-	}
-	public void setOverWriteFiles(boolean overwriteFiles) {
-		this.overwriteFiles = overwriteFiles;
-	}
-	public boolean getPublish() {
-		return publish;
-	}
-	public void setPublish(boolean publish) {
-		this.publish = publish;
-	}
-	public boolean getRun() {
-		return run;
-	}
-	public void setRun(boolean run) {
-		this.run = run;
-	}
-	public WebServiceScenario getScenario() {
-		return scenario;
-	}
-	public void setScenario(WebServiceScenario scenario) {
-		this.scenario = scenario;
-	}
-	public boolean getTest() {
-		return test;
-	}
-	public void setTest(boolean test) {
-		this.test = test;
-	}
-}
diff --git a/bundles/org.eclipse.wst.wsdl.validation/.classpath b/bundles/org.eclipse.wst.wsdl.validation/.classpath
deleted file mode 100644
index b0d695f..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/.classpath
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src/wsdlvalidateui">
-		<attributes>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" path="src/wsdlvalidate">
-		<attributes>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
-		<attributes>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
-		<attributes>
-		</attributes>
-	</classpathentry>
-	<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/build.properties b/bundles/org.eclipse.wst.wsdl.validation/build.properties
deleted file mode 100644
index 872405a..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/build.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-bin.includes = wsdlvalidate.jar,\
-               wsdlvalidateui.jar,\
-               plugin.xml,\
-               plugin.properties,\
-output.wsdlvalidate.jar = bin/
-source.wsdlvalidate.jar = src/wsdlvalidate/
-source.wsdlvalidateui.jar = src/wsdlvalidateui/
-jars.compile.order = wsdlvalidate.jar,\
-                     wsdlvalidateui.jar
-src.includes = build.properties,\
-               plugin.properties,\
-               plugin.xml,\
-               src/,\
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 90c3d79..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/plugin.xml
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.wst.wsdl.validation"
-   name="%_PLUGIN_NAME"
-   version="1.0.0"
-   provider-name="%_PROVIDER_NAME"
-   class="org.eclipse.wst.wsdl.validation.internal.ui.eclipse.ValidateWSDLPlugin">
-
-   <runtime>
-      <library name="wsdlvalidateui.jar">
-         <export name="*"/>
-      </library>
-      <library name="wsdlvalidate.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-   <requires>
-      <import plugin="org.eclipse.wst.common.dependencychecker"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.apache.ant"/>
-      <import plugin="org.eclipse.core.runtime.compatibility"/>
-      <import plugin="org.eclipse.wst.common.uriresolver"/>
-      <import plugin="org.eclipse.wst.validation"/>
-      <import plugin="org.eclipse.wst.xml.validation" export="true"/>
-      <import plugin="org.wsdl4j"/>
-      <import plugin="org.apache.xerces" export="true"/>
-   </requires>
-   
-   <extension point="org.eclipse.wst.common.dependencychecker.requiredFiles">
-      <requiredFile
-            pluginRelativePath="lib/qname.jar"
-            locationURL="http://prdownloads.sourceforge.net/wsdl4j/wsdl4j-bin-1.4.zip?download"/>
-      <requiredFile
-            pluginRelativePath="lib/wsdl4j.jar"
-            locationURL="http://prdownloads.sourceforge.net/wsdl4j/wsdl4j-bin-1.4.zip?download"/>
-   </extension>
-
-   <!-- 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.validation.internal.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 dbbfb27..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.IURIResolver;
-
-
-/**
- * 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 IURIResolver 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 9580b63..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/ValidationController.java
+++ /dev/null
@@ -1,395 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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)
-    {
-      //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 0f1191e..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.IURIResolver;
-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 IURIResolver 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 ada6e52..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/WSDLValidator.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.validation.internal;
-
-import java.io.InputStream;
-import java.util.Hashtable;
-import java.util.ResourceBundle;
-
-import org.eclipse.wst.wsdl.validation.internal.resolver.IURIResolver;
-import org.eclipse.wst.wsdl.validation.internal.resolver.URIResolver;
-
-/**
- * An main WSDL validator class. The WSDL validator validates WSDL documents.
- */
-public class WSDLValidator
-{
-  private static String VALIDATOR_RESOURCE_BUNDLE = "validatewsdl";
-  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);
-  }
-  
-  /**
-   * 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(formatURI(uri), inputStream);
-  }
-  
-  /**
-   * Add a URI resolver to the WSDL validator.
-   * 
-   * @param uriResolver The URI resolver to add to the WSDL validator.
-   */
-  public void addURIResolver(IURIResolver 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);
-  }
-  protected String formatURI(String uri)
-  {
-    uri = uri.replace('\\','/');
-    if(uri.startsWith("file:"))
-  	{
-  	  uri = uri.substring(6);
-  	  while(uri.startsWith("\\") || uri.startsWith("/"))
-  	  {
-  	  	uri = uri.substring(1);
-  	  }
-  	  uri = "file:///" + uri;
-  	}
-    return uri;
-  }
-}
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 0de9cee..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/exception/ValidateWSDLException.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.exception;
-
-/**
- * Custom exception for WSDL validation.
- */
-public class ValidateWSDLException extends Exception
-{
-	  //public static final long serialVersionUID = 1;
-  /**
-   * 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/IURIResolver.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/resolver/IURIResolver.java
deleted file mode 100644
index 999b75e..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/resolver/IURIResolver.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 IURIResolver
-{
- /**
-  * 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.
-  * @return An absolute URI for the resource.
-  */
-  public String resolve(String baseLocation, String publicId, String systemId);
-}
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 67d600a..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/resolver/URIResolver.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.validation.internal.resolver;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-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.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 IURIResolver, XMLEntityResolver
-{
-  private List extURIResolversList = new ArrayList();
-
-  /**
-   * Constructor. 
-   */
-  public URIResolver()
-  {
-  }
-
-
-  /**
-   * Add an extension URI resolver.
-   * 
-   * @param uriResolver
-   *          The extension URI resolver.
-   */
-  public void addURIResolver(IURIResolver uriResolver)
-  {
-    extURIResolversList.add(uriResolver);
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.eclipse.wsdl.validate.internal.resolver.IURIResolver#resolve(java.lang.String,
-   *      java.lang.String, java.lang.String)
-   */
-  public String resolve(String baseLocation, String publicId, String systemId)
-  {
-    String result = null;
-    Iterator resolverIter = extURIResolversList.iterator();
-    while(resolverIter.hasNext())
-    {
-      IURIResolver resolver = (IURIResolver)resolverIter.next();
-      if (resolver == null)
-      {
-        continue;
-      }
-      result = resolver.resolve(baseLocation, publicId, systemId);
-      if (result != null && !result.equals(systemId))
-      {
-        break;
-      }
-    }
-
-    // If we haven't been able to locate the result yet ask the internal XML
-    // catalog.
-    if (result == null && (publicId != null || systemId != null))
-    {
-      result = XMLCatalog.getInstance().resolveEntityLocation(publicId, systemId);
-    }
-    if(result == null)
-    {
-      result =  normalize(baseLocation, systemId);
-    }
-    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();
-    }
-    String result = resolve(resourceIdentifier.getBaseSystemId(), publicId, systemId);
-    XMLInputSource xmlInputSource = null;
-    if (result != null)
-    {
-      try
-      {
-        URL url = new URL(result);
-        InputStream is = url.openStream();
-        xmlInputSource = new XMLInputSource(publicId, result, result, is, null);
-      }
-      catch (FileNotFoundException e)
-      {
-        //System.out.println(e);
-      }
-    }
-    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 332e6cc..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 IURIResolver 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 IURIResolver getURIResolver()
-  {
-    if(resolver == null)
-    {
-      try
-      {
-        resolver = (IURIResolver)classloader.loadClass(classname).newInstance();
-      }
-      catch(Exception e)
-      {
-        try
-        {
-          resolver = (IURIResolver)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/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 c724460..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.IURIResolver;
-
-/**
- * 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 IURIResolver 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 13eb507..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/ImportHolder.java
+++ /dev/null
@@ -1,594 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.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 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('\\','/');
-    String classpathURI = valinfo.getURIResolver().resolve(this.contextURI, this.namespace, this.location);
-    if(classpathURI != null)
-    {
-      this.location = classpathURI;
-      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.location))
-        {
-          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();
-			  File canonicalfile = testfile.getCanonicalFile();
-			  String canonicalfileString = canonicalfile.getAbsolutePath();
-
-              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 (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 63fd646..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);
-        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 b13779b..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.IURIResolver;
-
-/**
- * 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 IURIResolver 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 eb1c5b4..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDLDocument.java
+++ /dev/null
@@ -1,1989 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.Import;
-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";
-
-  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);
-        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)
-  {
-    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(ElementLocation.ID);
-      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/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 ff1c32e..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 java.net.URL;
-
-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 namespace = resource.getNamespace();
-    URL url = null;
-    if(systemId != null)
-    {
-      url = new URL(systemId);
-    }
-    else if(publicId != null)
-    {
-      url = new URL(publicId);
-    }
-    else if(namespace != null)
-    {
-      url = new URL(namespace);
-    }
-    if(url != null)
-    {
-      InputStream is = url.openStream();
-      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 e78fc16..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/ValidateErrorHandler.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.validation.internal.wsdl11.xsd;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.xerces.dom3.DOMError;
-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 ff8c376..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/xml/DefaultXMLValidator.java
+++ /dev/null
@@ -1,560 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.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.eclipse.wst.wsdl.validation.internal.ValidationMessageImpl;
-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();
-	  }
-      String uri = uriResolver.resolve(null, publicId, systemId);
-      if (uri != null && !uri.equals(""))
-      {
-        InputSource is = new InputSource(uri);
-        if (is != null)
-        {
-          return is;
-        }
-      }
-      // 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.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))
-//      {
-//        wsdlURI = uri;
-//      }
-//      super.startElement(uri, localname, arg2, attributes);
-//
-//    }
-
-  }
-
-  /**
-   * @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 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))
-      {
-        
-        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(!ignoredNamespaceList.contains(namespace))
-            {
-              String resolvedURI = uriResolver.resolve(baselocation, namespace, namespace);
-              if(resolvedURI != null)
-              {
-                setSchemaLocation(namespace, resolvedURI);
-              }
-            }
-          }
-        }
-
-      }
-      super.startElement(uri, localname, arg2, attributes);
-
-    }
-  }
-
-//  /**
-//   * @see org.eclipse.wsdl.validate.internal.xml.IXMLValidator#getWSDLNamespace()
-//   */
-//  public String getWSDLNamespace()
-//  {
-//    return wsdlNamespace;
-//  }
-  
-  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 604db1a..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;
-      elementImpl.setUserData(
-        ElementLocation.ID,
-        new ElementLocation(locator.getLineNumber(), locator.getColumnNumber()),
-        null);
-    }
-    // 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 9567bfc..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/xml/XMLCatalog.java
+++ /dev/null
@@ -1,355 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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 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(6);
-    }
-    else if(schemadir.startsWith("file:"))
-    {
-      schemadir = schemadir.substring(5);
-    }
-    
-    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();
-        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.
-   */
-  private 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)
-        {
-        }
-      }
-    }
-    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 a827789..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/xml/XMLCatalogResolver.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.xml;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-
-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 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)
-    {
-      try
-      {
-        URL url = new URL(location);
-        InputStream is = url.openStream();
-        XMLInputSource inputSource = new XMLInputSource(publicId, systemId, systemId, is, null);
-        return inputSource;
-      }
-      catch(FileNotFoundException e)
-      {
-        System.out.println(e);
-      }
-    }
-    // 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 bbdeedf..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/validatewsdl.properties
+++ /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
-###############################################################################
-!-- 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 probelm 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_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 imported document''s target namespace {1}.
-!-- 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 437fc28..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 ffed954..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/WSDLConfigurator.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/WSDLConfigurator.java
deleted file mode 100644
index 2a8ec23..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/WSDLConfigurator.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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;
-
-import java.util.ResourceBundle;
-
-import org.eclipse.wst.wsdl.validation.internal.ValidatorRegistry;
-import org.eclipse.wst.wsdl.validation.internal.WSDLValidatorDelegate;
-import org.eclipse.wst.wsdl.validation.internal.wsdl11.WSDL11ValidatorDelegate;
-import org.eclipse.wst.wsdl.validation.internal.wsdl20.WSDL20ValidatorDelegate;
-
-import com.ibm.wsdl.Constants;
-
-/**
- * A class with methods to set validators and schemas that can be used
- * by all interfaces to the validator.
- */
-public class WSDLConfigurator
-{
-  /**
-   * Register a WSDL validator with the given namespace.
-   * 
-   * @param namespace The namespace of the validator.
-   * @param validatorClassname The name of the validator class to register.
-   * @param resourceBundle The name of the validator base resource bundle.
-   * @param classloader The classloader to use to load the validator.
-   */
-  public static void registerWSDLValidator(String namespace, String validatorClassname, String resourceBundle, ClassLoader classloader)
-  {
-    WSDLValidatorDelegate delegate = new WSDLValidatorDelegate(validatorClassname, resourceBundle, classloader);
-    ValidatorRegistry.getInstance().registerValidator(namespace, delegate, ValidatorRegistry.WSDL_VALIDATOR);
-  }
-
-  /**
-   * Register an extension validator with the given namespace.
-   * 
-   * @param namespace The namespace of the validator.
-   * @param validatorClassname The name of the validator class to register.
-   * @param resourceBundle The name of the validator base resource bundle.
-   * @param classloader The classloader to use to load the validator.
-   */
-  public static void registerExtensionValidator(String namespace, String validatorClassname, String resourceBundle, ClassLoader classloader)
-  {
-    WSDLValidatorDelegate delegate = new WSDLValidatorDelegate(validatorClassname, resourceBundle, classloader);
-    ValidatorRegistry.getInstance().registerValidator(namespace, delegate, ValidatorRegistry.EXT_VALIDATOR);
-  }
-
-  /**
-   * Register a WSDL 1.1 validator with the given namespace.
-   * 
-   * @param namespace The namespace of the validator
-   * @param validatorClassname The name of the validator class to register
-   * @param resourceBundle The name of the validator base resource bundle.
-   * @param classloader The classloader to use to load the validator.
-   */
-  public static void registerWSDL11Validator(String namespace, String validatorClassname, String resourceBundle, ClassLoader classloader)
-  {
-  	WSDL11ValidatorDelegate delegate = new WSDL11ValidatorDelegate(validatorClassname, resourceBundle, classloader);
-    org.eclipse.wst.wsdl.validation.internal.wsdl11.ValidatorRegistry.getInstance().registerValidator(namespace, delegate);
-  }
-  
-  /**
-   * Register a WSDL 2.0 validator with the given namespace.
-   * 
-   * @param namespace The namespace of the validator
-   * @param validatorClassname The name of the validator class to register
-   * @param resourceBundle The name of the validator base resource bundle.
-   */
-  public static void registerWSDL20Validator(String namespace, String validatorClassname, String resourceBundle)
-  {
-    WSDL20ValidatorDelegate delegate = new WSDL20ValidatorDelegate(validatorClassname, resourceBundle);
-    org.eclipse.wst.wsdl.validation.internal.wsdl20.ValidatorRegistry.getInstance().registerValidator(namespace, delegate);
-  }
-
-  /**
-   * Register the default validators. Registers validators for:
-   * WSDL 1.1
-   * WSDL 1.1 SOAP
-   * WSDL 1.1 HTTP
-   * WSDL 1.1 MIME
-   * 
-   * @param rb - the resource bundle of the WSDL 1.1 validator
-   */
-  public static void registerDefaultValidators(ResourceBundle rb)
-  {
-    // Register the WSDL 1.1 validator controller and validators.
-    registerWSDLValidator(Constants.NS_URI_WSDL, "org.eclipse.wst.wsdl.validation.internal.wsdl11.WSDL11ValidatorController", "validatewsdl", null);
-    registerWSDL11Validator(Constants.NS_URI_WSDL, "org.eclipse.wst.wsdl.validation.internal.wsdl11.WSDL11BasicValidator", "validatewsdl", null);
-    registerWSDL11Validator(
-      org.eclipse.wst.wsdl.validation.internal.Constants.NS_HTTP, "org.eclipse.wst.wsdl.validation.internal.wsdl11.http.HTTPValidator","validatewsdlhttp", null);
-    registerWSDL11Validator(
-      org.eclipse.wst.wsdl.validation.internal.Constants.NS_SOAP11,"org.eclipse.wst.wsdl.validation.internal.wsdl11.soap.SOAPValidator","validatewsdlsoap", null);
-    registerWSDL11Validator(
-      org.eclipse.wst.wsdl.validation.internal.Constants.NS_MIME,"org.eclipse.wst.wsdl.validation.internal.wsdl11.mime.MIMEValidator","validatewsdlmime", null);
-    
-    // The WSDL 1.1 schema validator is a special case as it is registered for three namespaces.
-    // We will call directly here so we can use the same delegate for all three namespaces.
-    WSDL11ValidatorDelegate delegate = new WSDL11ValidatorDelegate("org.eclipse.wst.wsdl.validation.internal.wsdl11.xsd.InlineSchemaValidator", "validatewsdl");
-    org.eclipse.wst.wsdl.validation.internal.wsdl11.ValidatorRegistry.getInstance().registerValidator(Constants.NS_URI_XSD_1999, delegate);
-    org.eclipse.wst.wsdl.validation.internal.wsdl11.ValidatorRegistry.getInstance().registerValidator(Constants.NS_URI_XSD_2000, delegate);
-    org.eclipse.wst.wsdl.validation.internal.wsdl11.ValidatorRegistry.getInstance().registerValidator(Constants.NS_URI_XSD_2001, delegate);
-    
-    // Register the WSDL 2.0 validator controller and validators.
-//    registerWSDLValidator(org.eclipse.wsdl20.model.impl.Constants.NS_URI_WSDL, "org.eclipse.wst.wsdl.validation.internal.wsdl20.WSDL20ValidatorController", "validatewsdl", null);
-//    
-//    registerWSDL20Validator(org.eclipse.wsdl20.model.impl.Constants.NS_URI_WSDL, "org.eclipse.wst.wsdl.validation.internal.wsdl20.WSDL20BasicValidator", "validatewsdl");
-  }
-}
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 32d5b92..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/ant/WSDLValidate.java
+++ /dev/null
@@ -1,449 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.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.resolver.URIResolverDelegate;
-import org.eclipse.wst.wsdl.validation.internal.ui.WSDLConfigurator;
-import org.eclipse.wst.wsdl.validation.internal.util.MessageGenerator;
-
-/**
- * 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 WSI_REQUIRE = "require";
-  protected final String WSI_SUGGEST = "suggest";
-  protected final String WSI_IGNORE = "ignore";
-
-  // 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 String wsiLevel = WSI_REQUIRE;
-  protected List wsdl11validators = 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 WS-I compliance level of the validator.
-   * 
-   * @param compliancelevel - the compliance level to set
-   */
-  public void setWSICompliance(String compliancelevel)
-  {
-    if (compliancelevel.equalsIgnoreCase(WSI_SUGGEST))
-    {
-      wsiLevel = WSI_SUGGEST;
-    }
-    else if (compliancelevel.equalsIgnoreCase(WSI_IGNORE))
-    {
-      wsiLevel = WSI_IGNORE;
-    }
-    else
-    {
-      wsiLevel = WSI_REQUIRE;
-    }
-  }
-
-  /**
-   * 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);
-  }
-  
-  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)
-    {
-      files.add(file);
-    }
-
-    // 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[] filelist = ds.getIncludedFiles();
-      int numFiles = filelist.length;
-      if (files != null && numFiles > 0)
-      {
-        for (int i = 0; i < numFiles; i++)
-        {
-          files.add(filelist[i]);
-        }
-      }
-    }
-    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
-    ResourceBundle validatorRB = null;
-    MessageGenerator messGen = null;
-    try
-    {
-      ResourceBundle uiRB = ResourceBundle.getBundle(UI_PROPERTIES);
-      messGen = new MessageGenerator(uiRB);
-      validatorRB = ResourceBundle.getBundle(VALIDATOR_PROPERTIES);
-    }
-    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("org.eclipse.wsdl.validate.ui.ant.XMLCatalogImpl", getClass().getClassLoader());
-    XMLCatalogImpl xmlCatalog = (XMLCatalogImpl)org.eclipse.wst.wsdl.validation.internal.xml.XMLCatalog.getInstance();
-    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();
-      WSDLConfigurator.registerWSDL11Validator(extVal.getNamespace(), extVal.getClassName(), extVal.getResourceBundle(), null);
-    }
-
-    // The user didn't specify any files to validate.
-    if (files == null || files.isEmpty())
-    {
-      System.err.println(messGen.getString(_ERROR_NO_FILE_SPECIFIED));
-      return;
-    }
-
-    // Register the default validators and schemas.
-    WSDLConfigurator.registerDefaultValidators(validatorRB);
-    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);
-
-    int wsiConformanceLevel;
-    
-    // Set the WS-I compliance level.
-    if (wsiLevel.equals(WSI_SUGGEST))
-    {
-      //wsiConformanceLevel = ValidationController.WSI_SUGGEST;
-    }
-    else if (wsiLevel.equals(WSI_IGNORE))
-    {
-      //wsiConformanceLevel = ValidationController.WSI_IGNORE;
-    }
-    else
-    {
-      //wsiConformanceLevel = ValidationController.WSI_REQUIRE;
-    }
-
-    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());
-        if (notvalid && failOnError)
-        {
-          // we fail on error by throwing a build exception
-          throw new BuildException(messGen.getString(_EXC_WSDL_FAIL_ON_ERROR));
-        }
-      }
-      catch (Exception e)
-      {
-        System.err.println(messGen.getString(_EXC_UNABLE_TO_VALIDATE_FILE, filename, e));
-      }
-    }
-
-    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 890f8fd..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/ant/XMLCatalogImpl.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.internal.ui.ant;
-
-import java.io.IOException;
-
-import org.apache.tools.ant.types.DTDLocation;
-import org.apache.tools.ant.types.XMLCatalog;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
-/**
- * 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 (IOException e)
-    {
-    }
-    catch (SAXException e)
-    {
-    }
-    // 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 0565862..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.IURIResolver;
-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++)
-      {
-        IURIResolver 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 IURIResolver 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 33c8f2b..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/eclipse/URIResolverWrapper.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.net.URL;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.common.uriresolver.URIResolver;
-import org.eclipse.wst.common.uriresolver.URIResolverPlugin;
-import org.eclipse.wst.wsdl.validation.internal.resolver.IURIResolver;
-
-/**
- * An wrapper URI resolver that wraps the Web Standard Tools URI resolver
- * in a WSDL validator URI resolver.
- */
-public class URIResolverWrapper implements IURIResolver
-{
-  /**
-   * Constructor.
-   */
-  public URIResolverWrapper()
-  {
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wsdl.validate.internal.resolver.IURIResolver#resolve(java.lang.String, java.lang.String, java.lang.String)
-   */
-  public String resolve(String baseLocation, String publicId, String systemId)
-  {
-    URIResolver resolver = URIResolverPlugin.createResolver();
-    String result = resolver.resolve(baseLocation, publicId, systemId);
-    try
-    {
-      URL tempURL = new URL(result);
-      tempURL = Platform.resolve(tempURL);
-      result = tempURL.toString();
-    }
-    catch(Exception e)
-    {
-      result = null;
-    }
-    // If the result is the same as the request return null.
-    if (result != null && (result.equals(systemId)))
-    {
-      result = null;
-    }
-
-    return result;
-  }
-}
\ 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 0635b1b..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.ValidationInfoImpl;
-import org.eclipse.wst.wsdl.validation.internal.IValidationMessage;
-import org.eclipse.wst.wsdl.validation.internal.ValidationMessageImpl;
-import org.eclipse.wst.wsdl.validation.internal.IValidationReport;
-import org.eclipse.wst.wsdl.validation.internal.xml.XMLMessageInfoHelper;
-import org.eclipse.wst.xml.validation.internal.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();
-        }
-        if (location.startsWith("/"))
-        {
-          valReport = wsdlValidator.validate(location, 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.validation.internal.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.validation.internal.core.ValidationMessage[] convertValidationMessages(IValidationMessage[] messages)
-  {
-  	int numMessages = messages.length;
-  	org.eclipse.wst.xml.validation.internal.core.ValidationMessage[] convertedMessages = new org.eclipse.wst.xml.validation.internal.core.ValidationMessage[numMessages];
-  	
-  	for(int i = 0; i < numMessages; i++)
-  	{
-  	  IValidationMessage mess = messages[i];
-      
-      org.eclipse.wst.xml.validation.internal.core.ValidationMessage convertMess = null;
-      if (mess instanceof ValidationMessageImpl)
-      {   String errorKey = ((ValidationMessageImpl)mess).getErrorKey();
-          Object[] messageArgs = ((ValidationMessageImpl)mess).getMessageArguments();
-          convertMess = new org.eclipse.wst.xml.validation.internal.core.ValidationMessage(mess.getMessage(), mess.getLine(), mess.getColumn(), mess.getURI(), errorKey, messageArgs);
-      }
-      else
-      {
-         convertMess = new org.eclipse.wst.xml.validation.internal.core.ValidationMessage(mess.getMessage(),mess.getLine(),mess.getColumn(), mess.getURI());
-      }
-  	  if(mess.getSeverity() == IValidationMessage.SEV_WARNING)
-	  {
-	  	convertMess.setSeverity(org.eclipse.wst.xml.validation.internal.core.ValidationMessage.SEV_LOW);
-	  }
-	  else
-	  {
-	  	convertMess.setSeverity(org.eclipse.wst.xml.validation.internal.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.validation.internal.core.ValidationMessage convertNestedMess = new org.eclipse.wst.xml.validation.internal.core.ValidationMessage(nestedMess.getMessage(),nestedMess.getLine(),nestedMess.getColumn(), nestedMess.getURI());
-    	  if(nestedMess.getSeverity() == IValidationMessage.SEV_WARNING)
-    	  {
-    	  	convertNestedMess.setSeverity(org.eclipse.wst.xml.validation.internal.core.ValidationMessage.SEV_LOW);
-    	  }
-    	  else
-    	  {
-    	  	convertNestedMess.setSeverity(org.eclipse.wst.xml.validation.internal.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.validation.internal.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.validation.internal.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 2cd8f08..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/eclipse/ValidateWSDLPlugin.java
+++ /dev/null
@@ -1,527 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.IPluginDescriptor;
-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.ui.WSDLConfigurator;
-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(IPluginDescriptor descriptor)
-  {
-    super(descriptor);
-//    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();
-//
-//    WSDLConfigurator.registerDefaultValidators(wsdlValidatorResourceBundle);
-  }
-
-  /* (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();
-
-    WSDLConfigurator.registerDefaultValidators(wsdlValidatorResourceBundle);
-  }
-  /* (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)
-           {
-            WSDLConfigurator.registerWSDLValidator(namespace, validatorClass, resourceBundle, pluginLoader);
-          }
-          else if (validatorType == EXT_VALIDATOR)
-           {
-            WSDLConfigurator.registerExtensionValidator(namespace, validatorClass, resourceBundle, pluginLoader);
-          }
-//          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();
-            
-          WSDLConfigurator.registerWSDL11Validator(namespace, validatorClass, resourceBundle, pluginLoader);
-        }
-        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 a283b74..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/eclipse/Validator.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.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.validation.internal.core.Helper;
-import org.eclispe.wst.validation.internal.core.ValidationException;
-
-
-/**
- * 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)
-            {
-              if (((Helper) helper).isInJavaBuildPath(file)  && !((Helper) helper).isInJavaSourcePath(file))
-              {
-                continue;
-              }
-              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 8bad990..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/eclipse/WSDLValidator.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.validation.internal.ui.eclipse;
-
-import java.io.InputStream;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.wst.wsdl.validation.internal.IValidationReport;
-import org.eclipse.wst.wsdl.validation.internal.resolver.IURIResolver;
-
-/**
- * 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 
-{
-	private static WSDLValidator instance = null;
-	
-	private org.eclipse.wst.wsdl.validation.internal.WSDLValidator wsdlValidator;
-	/**
-	 * The constructor registers all of the URI resolvers defined via the
-	 * WSDL URI resolver extension point with the WSDL validator. 
-	 * 
-	 */
-	private WSDLValidator()
-	{
-	  this.wsdlValidator = new org.eclipse.wst.wsdl.validation.internal.WSDLValidator();
-	  URIResolverRegistryReader uriRR = new URIResolverRegistryReader();
-	  List resolvers = uriRR.readRegistry();
-	  Iterator resolverIter = resolvers.iterator();
-	  while(resolverIter.hasNext())
-	  {
-	  	IURIResolver resolver = (IURIResolver)resolverIter.next();
-	  	wsdlValidator.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 2acbfa0..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.resolver.IURIResolver;
-import org.eclipse.wst.wsdl.validation.internal.resolver.URIResolverDelegate;
-import org.eclipse.wst.wsdl.validation.internal.ui.WSDLConfigurator;
-import org.eclipse.wst.wsdl.validation.internal.util.MessageGenerator;
-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(IURIResolver 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;
-
-    // register the default validators
-    WSDLConfigurator.registerDefaultValidators(validatorRB);
-
-    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))
-            {  
-              WSDLConfigurator.registerWSDL11Validator(namespace, validatorClass, propertiesFile, null);
-            }
-            else if(param.equalsIgnoreCase(WSDLValidate.PARAM_EXTVAL))
-            {
-              WSDLConfigurator.registerExtensionValidator(namespace, validatorClass, propertiesFile, null);
-            }
-          }
-          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 8c4f20f..0000000
--- a/bundles/org.eclipse.wst.wsdl/.classpath
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src">
-		<attributes>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
-		<attributes>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
-		<attributes>
-		</attributes>
-	</classpathentry>
-	<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 46d2650..0000000
--- a/bundles/org.eclipse.wst.wsdl/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-wsdl.jar
-build.xml
-temp.folder
-org.eclipse.wst.wsdl_1.0.0.jar
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/build.properties b/bundles/org.eclipse.wst.wsdl/build.properties
deleted file mode 100644
index 2decdf7..0000000
--- a/bundles/org.eclipse.wst.wsdl/build.properties
+++ /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
-###############################################################################
-bin.includes = wsdl.jar,\
-               lib/,\
-               plugin.properties,\
-               plugin.xml,\
-               grabjars.xml,\
-               xsd/
-jars.compile.order = wsdl.jar
-source.wsdl.jar = src/
-output.wsdl.jar = bin/
-src.includes = lib/,\
-               plugin.properties,\
-               plugin.xml,\
-               grabjars.xml,\
-               src/,\
-               build.properties,\
-               xsd/
diff --git a/bundles/org.eclipse.wst.wsdl/component.xml b/bundles/org.eclipse.wst.wsdl/component.xml
deleted file mode 100644
index c617a0e..0000000
--- a/bundles/org.eclipse.wst.wsdl/component.xml
+++ /dev/null
@@ -1,76 +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" />
-	<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 2346c4b..0000000
--- a/bundles/org.eclipse.wst.wsdl/plugin.properties
+++ /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
-###############################################################################
-
-# ====================================================================
-# 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
-
-_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 b34e1f9..0000000
--- a/bundles/org.eclipse.wst.wsdl/plugin.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.wst.wsdl"
-   name="%pluginName"
-   version="1.0.0"
-   provider-name="%providerName"
-   class="org.eclipse.wst.wsdl.WSDLPlugin$Implementation">
-
-   <runtime>
-      <library name="wsdl.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-
-   <requires>
-      <import plugin="org.eclipse.wst.common.dependencychecker"/>
-      <import plugin="org.eclipse.core.runtime.compatibility"/>
-      <import plugin="org.eclipse.emf.ecore"/>
-      <import plugin="org.eclipse.xsd"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.wst.sse.core"/>
-      <import plugin="org.wsdl4j"/>
-   </requires>
-
-   <extension point="org.eclipse.wst.common.dependencychecker.requiredFiles">
-      <requiredFile
-            pluginRelativePath="lib/qname.jar"
-            locationURL="http://prdownloads.sourceforge.net/wsdl4j/wsdl4j-bin-1.4.zip?download"/>
-      <requiredFile
-            pluginRelativePath="lib/wsdl4j.jar"
-            locationURL="http://prdownloads.sourceforge.net/wsdl4j/wsdl4j-bin-1.4.zip?download"/>
-   </extension>
-
-   <extension-point id="extensibilityElementFactories" name="WSDL Extensibility Element Factories"/>
-
-   <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.xml.uriresolver.catalogContributor">
-     <catalogContributor catalogId="default">
-       <mappingInfo key="http://schemas.xmlsoap.org/wsdl/" uri="xsd/wsdl.xsd"/>
-       <mappingInfo key="http://schemas.xmlsoap.org/wsdl/soap/" uri="xsd/soap.xsd"/>
-       <mappingInfo key="http://schemas.xmlsoap.org/wsdl/http/" uri="xsd/http.xsd"/>       
-       <mappingInfo key="http://schemas.xmlsoap.org/wsdl/mime/" uri="xsd/wsdl-mime.xsd"/>      
-       <mappingInfo key="http://schemas.xmlsoap.org/soap/encoding/" uri="xsd/soapenc.xsd"/>
-     </catalogContributor>
-  </extension>
-  -->
-
-  <!-- define a wsdl content type -->
-  <extension
-         point="org.eclipse.core.runtime.contentTypes">
-         <content-type
-               priority="high"
-               name="WSDL Content Type"
-               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/model/HTTP.genmodel b/bundles/org.eclipse.wst.wsdl/src/model/HTTP.genmodel
deleted file mode 100644
index 8e05ff3..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/model/MIME.genmodel b/bundles/org.eclipse.wst.wsdl/src/model/MIME.genmodel
deleted file mode 100644
index a8f6c8a..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/model/SOAP.genmodel b/bundles/org.eclipse.wst.wsdl/src/model/SOAP.genmodel
deleted file mode 100644
index d864da7..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/model/http.ecore b/bundles/org.eclipse.wst.wsdl/src/model/http.ecore
deleted file mode 100644
index c9a8793..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/model/mime.ecore b/bundles/org.eclipse.wst.wsdl/src/model/mime.ecore
deleted file mode 100644
index d1faa45..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/model/soap.ecore b/bundles/org.eclipse.wst.wsdl/src/model/soap.ecore
deleted file mode 100644
index da283ee..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/model/wsdl.ecore b/bundles/org.eclipse.wst.wsdl/src/model/wsdl.ecore
deleted file mode 100644
index a8ad6b9..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/model/wsdl.genmodel b/bundles/org.eclipse.wst.wsdl/src/model/wsdl.genmodel
deleted file mode 100644
index 76445de..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/org/eclipse/wst/wsdl/Binding.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/Binding.java
deleted file mode 100644
index 67c1687..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/org/eclipse/wst/wsdl/BindingFault.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/BindingFault.java
deleted file mode 100644
index 74e955a..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/org/eclipse/wst/wsdl/BindingInput.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/BindingInput.java
deleted file mode 100644
index ff0f4ab..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/org/eclipse/wst/wsdl/BindingOperation.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/BindingOperation.java
deleted file mode 100644
index 084e3c9..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/org/eclipse/wst/wsdl/BindingOutput.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/BindingOutput.java
deleted file mode 100644
index 974df56..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/org/eclipse/wst/wsdl/Definition.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/Definition.java
deleted file mode 100644
index adcf7c4..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/org/eclipse/wst/wsdl/ExtensibilityElement.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/ExtensibilityElement.java
deleted file mode 100644
index ee78ce2..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/org/eclipse/wst/wsdl/ExtensibleElement.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/ExtensibleElement.java
deleted file mode 100644
index b53af3d..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/org/eclipse/wst/wsdl/Fault.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/Fault.java
deleted file mode 100644
index 9878665..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/org/eclipse/wst/wsdl/Import.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/Import.java
deleted file mode 100644
index 5c14597..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/org/eclipse/wst/wsdl/Input.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/Input.java
deleted file mode 100644
index 77281e6..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/org/eclipse/wst/wsdl/Message.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/Message.java
deleted file mode 100644
index fb94d51..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/org/eclipse/wst/wsdl/MessageReference.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/MessageReference.java
deleted file mode 100644
index 95c41e4..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/org/eclipse/wst/wsdl/Namespace.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/Namespace.java
deleted file mode 100644
index 4a30050..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/org/eclipse/wst/wsdl/Operation.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/Operation.java
deleted file mode 100644
index 773e0b7..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/org/eclipse/wst/wsdl/Output.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/Output.java
deleted file mode 100644
index 1009ddb..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/org/eclipse/wst/wsdl/Part.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/Part.java
deleted file mode 100644
index 265b092..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/org/eclipse/wst/wsdl/Port.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/Port.java
deleted file mode 100644
index fea61fc..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/org/eclipse/wst/wsdl/PortType.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/PortType.java
deleted file mode 100644
index 6637cf8..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/org/eclipse/wst/wsdl/Service.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/Service.java
deleted file mode 100644
index c214c7b..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/org/eclipse/wst/wsdl/Types.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/Types.java
deleted file mode 100644
index 8191062..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/org/eclipse/wst/wsdl/UnknownExtensibilityElement.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/UnknownExtensibilityElement.java
deleted file mode 100644
index 7d6f9cb..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/org/eclipse/wst/wsdl/WSDLElement.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/WSDLElement.java
deleted file mode 100644
index ec45ba7..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/org/eclipse/wst/wsdl/WSDLFactory.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/WSDLFactory.java
deleted file mode 100644
index 62c6869..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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
-   */
-	WSDLPackage getWSDLPackage();
-
-} //WSDLFactory
diff --git a/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/WSDLPackage.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/WSDLPackage.java
deleted file mode 100644
index 03f68cc..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/org/eclipse/wst/wsdl/WSDLPlugin.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/WSDLPlugin.java
deleted file mode 100644
index 7cff6ba..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/WSDLPlugin.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;
-
-import javax.wsdl.factory.WSDLFactory;
-
-import org.eclipse.core.runtime.IPluginDescriptor;
-import org.eclipse.emf.common.EMFPlugin;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.wst.wsdl.util.ExtensibilityElementFactoryRegistry;
-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;
-
-
-/**
- * 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 private Implementation 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 Implementation getPlugin()
-  {
-    return plugin;
-  }
-
-  /**
-   * The actual implementation of the Eclipse <b>Plugin</b>.
-   */
-  public static class Implementation extends EclipsePlugin
-  {
-    /**
-     * Creates an instance.
-     * @param descriptor the description of the plugin.
-     */
-    public Implementation(IPluginDescriptor descriptor)
-    {
-      super(descriptor);
-
-      // Remember the static instance.
-      //
-      plugin = this;
-    }
-  }
-  
-  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/org/eclipse/wst/wsdl/XSDSchemaExtensibilityElement.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/XSDSchemaExtensibilityElement.java
deleted file mode 100644
index 00bb66d..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/org/eclipse/wst/wsdl/binding/http/HTTPAddress.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/http/HTTPAddress.java
deleted file mode 100644
index e5ab588..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/org/eclipse/wst/wsdl/binding/http/HTTPBinding.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/http/HTTPBinding.java
deleted file mode 100644
index 573254c..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/org/eclipse/wst/wsdl/binding/http/HTTPFactory.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/http/HTTPFactory.java
deleted file mode 100644
index bd582b1..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/org/eclipse/wst/wsdl/binding/http/HTTPOperation.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/http/HTTPOperation.java
deleted file mode 100644
index 170a9a1..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/org/eclipse/wst/wsdl/binding/http/HTTPPackage.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/http/HTTPPackage.java
deleted file mode 100644
index 341c309..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/http/HTTPPackage.java
+++ /dev/null
@@ -1,613 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.WSDLPackage;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-
-/**
- * <!-- 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/org/eclipse/wst/wsdl/binding/http/HTTPUrlEncoded.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/http/HTTPUrlEncoded.java
deleted file mode 100644
index d06c008..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/org/eclipse/wst/wsdl/binding/http/HTTPUrlReplacement.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/http/HTTPUrlReplacement.java
deleted file mode 100644
index 00d1dde..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPAddressImpl.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPAddressImpl.java
deleted file mode 100644
index 25174e3..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPAddressImpl.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.binding.http.internal.impl;
-
-
-import org.eclipse.wst.wsdl.internal.impl.ExtensibilityElementImpl;
-
-import javax.xml.namespace.QName;
-
-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.w3c.dom.Element;
-
-import org.eclipse.emf.ecore.EAttribute;
-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;
-
-/**
- * <!-- 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 {
-	/**
-	 * 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());
-    }
-  }
-} //HTTPAddressImpl
diff --git a/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPBindingImpl.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPBindingImpl.java
deleted file mode 100644
index 64d6f3b..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPBindingImpl.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.binding.http.internal.impl;
-
-
-import org.eclipse.wst.wsdl.internal.impl.ExtensibilityElementImpl;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EAttribute;
-
-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.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 {
-	/**
-	 * 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());
-    }
-  }
-
-} //HTTPBindingImpl
diff --git a/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPFactoryImpl.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPFactoryImpl.java
deleted file mode 100644
index 73ea601..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPFactoryImpl.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.*;
-
-/**
- * <!-- 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/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPOperationImpl.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPOperationImpl.java
deleted file mode 100644
index 462d40f..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPOperationImpl.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.binding.http.internal.impl;
-
-
-import org.eclipse.wst.wsdl.internal.impl.ExtensibilityElementImpl;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EAttribute;
-
-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.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 {
-	/**
-	 * 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());
-    }
-  }
-
-} //HTTPOperationImpl
diff --git a/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPPackageImpl.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPPackageImpl.java
deleted file mode 100644
index a7bba3c..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPPackageImpl.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.binding.http.internal.impl;
-
-import org.eclipse.wst.wsdl.WSDLPackage;
-
-
-import org.eclipse.wst.wsdl.internal.impl.WSDLPackageImpl;
-
-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.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.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/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPUrlEncodedImpl.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPUrlEncodedImpl.java
deleted file mode 100644
index 6ce0f0e..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPUrlEncodedImpl.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.binding.http.internal.impl;
-
-
-import org.eclipse.wst.wsdl.internal.impl.ExtensibilityElementImpl;
-
-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.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 {
-	/**
-	 * <!-- 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);
-	}
-
-} //HTTPUrlEncodedImpl
diff --git a/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPUrlReplacementImpl.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPUrlReplacementImpl.java
deleted file mode 100644
index f4e85a8..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPUrlReplacementImpl.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.binding.http.internal.impl;
-
-
-import org.eclipse.wst.wsdl.internal.impl.ExtensibilityElementImpl;
-
-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.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 {
-	/**
-	 * <!-- 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);
-	}
-
-} //HTTPUrlReplacementImpl
diff --git a/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/http/internal/util/HTTPAdapterFactory.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/http/internal/util/HTTPAdapterFactory.java
deleted file mode 100644
index 7c86a46..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/http/internal/util/HTTPAdapterFactory.java
+++ /dev/null
@@ -1,332 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.WSDLElement;
-
-
-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.binding.http.*;
-
-/**
- * <!-- 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/org/eclipse/wst/wsdl/binding/http/internal/util/HTTPConstants.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/http/internal/util/HTTPConstants.java
deleted file mode 100644
index 1b46a1a..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/org/eclipse/wst/wsdl/binding/http/internal/util/HTTPExtensibilityElementFactory.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/http/internal/util/HTTPExtensibilityElementFactory.java
deleted file mode 100644
index d645a4a..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/http/internal/util/HTTPExtensibilityElementFactory.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.binding.http.internal.util;
-
-import org.eclipse.wst.wsdl.binding.http.HTTPFactory;
-
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-import org.eclipse.wst.wsdl.WSDLFactory;
-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/org/eclipse/wst/wsdl/binding/http/internal/util/HTTPSwitch.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/http/internal/util/HTTPSwitch.java
deleted file mode 100644
index 58284ef..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/http/internal/util/HTTPSwitch.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 org.eclipse.wst.wsdl.WSDLElement;
-
-
-import javax.wsdl.extensions.ExtensibilityElement;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.wst.wsdl.binding.http.*;
-
-/**
- * <!-- 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/org/eclipse/wst/wsdl/binding/mime/MIMEContent.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/mime/MIMEContent.java
deleted file mode 100644
index 6866f83..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/org/eclipse/wst/wsdl/binding/mime/MIMEFactory.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/mime/MIMEFactory.java
deleted file mode 100644
index 855e119..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/org/eclipse/wst/wsdl/binding/mime/MIMEMimeXml.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/mime/MIMEMimeXml.java
deleted file mode 100644
index 64794c5..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/org/eclipse/wst/wsdl/binding/mime/MIMEMultipartRelated.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/mime/MIMEMultipartRelated.java
deleted file mode 100644
index 0254fd5..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/mime/MIMEMultipartRelated.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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 java.util.List;
-
-import javax.wsdl.extensions.mime.MIMEPart;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- 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/org/eclipse/wst/wsdl/binding/mime/MIMEPackage.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/mime/MIMEPackage.java
deleted file mode 100644
index ba2903d..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/mime/MIMEPackage.java
+++ /dev/null
@@ -1,560 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.WSDLPackage;
-
-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 -->
- * @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/org/eclipse/wst/wsdl/binding/mime/MIMEPart.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/mime/MIMEPart.java
deleted file mode 100644
index 22cb823..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEContentImpl.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEContentImpl.java
deleted file mode 100644
index 1aa6a39..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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 org.eclipse.wst.wsdl.Part;
-
-
-import org.eclipse.wst.wsdl.internal.impl.ExtensibilityElementImpl;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.emf.common.notify.Notification;
-
-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.w3c.dom.Element;
-
-import org.eclipse.emf.ecore.EAttribute;
-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;
-
-/**
- * <!-- 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 {
-	/**
-	 * 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/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEFactoryImpl.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEFactoryImpl.java
deleted file mode 100644
index 0138a5f..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEFactoryImpl.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.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.*;
-
-/**
- * <!-- 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/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEMimeXmlImpl.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEMimeXmlImpl.java
deleted file mode 100644
index 3754b41..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEMimeXmlImpl.java
+++ /dev/null
@@ -1,258 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.Part;
-
-
-import org.eclipse.wst.wsdl.internal.impl.ExtensibilityElementImpl;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.EAttribute;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-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.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 {
-	/**
-	 * 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/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEMultipartRelatedImpl.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEMultipartRelatedImpl.java
deleted file mode 100644
index 120618d..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEMultipartRelatedImpl.java
+++ /dev/null
@@ -1,243 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.internal.impl.ExtensibilityElementImpl;
-
-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.EAttribute;
-
-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.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 {
-	/**
-	 * 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
-	 */
-	public void addMIMEPart(javax.wsdl.extensions.mime.MIMEPart mimePart) {
-		// 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 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);
-	}
-	
-  //
-  // Reconcile methods: DOM -> Model
-  //
-
-  public void reconcileAttributes(Element changedElement)
-  {
-  }
-  
-  //
-  // For reconciliation: Model -> DOM
-  //
-
-  protected void changeAttribute(EAttribute eAttribute)
-  {
-  }
-
-} //MIMEMultipartRelatedImpl
diff --git a/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEPackageImpl.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEPackageImpl.java
deleted file mode 100644
index 2016db1..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEPackageImpl.java
+++ /dev/null
@@ -1,432 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.WSDLPackage;
-
-
-import org.eclipse.wst.wsdl.internal.impl.WSDLPackageImpl;
-
-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.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.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/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEPartImpl.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEPartImpl.java
deleted file mode 100644
index 1444849..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEPartImpl.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.binding.mime.internal.impl;
-
-
-import java.util.List;
-
-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.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 {
-	/**
-	 * <!-- 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
-	 */
-	public void addExtensibilityElement(ExtensibilityElement extensibilityElement) {
-		// 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 List getExtensibilityElements() {
-		// 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 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);
-	}
-
-} //MIMEPartImpl
diff --git a/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/mime/internal/util/MIMEAdapterFactory.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/mime/internal/util/MIMEAdapterFactory.java
deleted file mode 100644
index aa887e1..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/org/eclipse/wst/wsdl/binding/mime/internal/util/MIMEConstants.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/mime/internal/util/MIMEConstants.java
deleted file mode 100644
index de89897..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/org/eclipse/wst/wsdl/binding/mime/internal/util/MIMEExtensibilityElementFactory.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/mime/internal/util/MIMEExtensibilityElementFactory.java
deleted file mode 100644
index 4f8a0fe..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/mime/internal/util/MIMEExtensibilityElementFactory.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.binding.mime.internal.util;
-
-import org.eclipse.wst.wsdl.binding.mime.MIMEFactory;
-
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-import org.eclipse.wst.wsdl.WSDLFactory;
-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/org/eclipse/wst/wsdl/binding/mime/internal/util/MIMESwitch.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/mime/internal/util/MIMESwitch.java
deleted file mode 100644
index 53a56df..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/org/eclipse/wst/wsdl/binding/soap/SOAPAddress.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/soap/SOAPAddress.java
deleted file mode 100644
index f7efead..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/org/eclipse/wst/wsdl/binding/soap/SOAPBinding.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/soap/SOAPBinding.java
deleted file mode 100644
index 6c5414d..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/org/eclipse/wst/wsdl/binding/soap/SOAPBody.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/soap/SOAPBody.java
deleted file mode 100644
index cb416ba..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/org/eclipse/wst/wsdl/binding/soap/SOAPFactory.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/soap/SOAPFactory.java
deleted file mode 100644
index f27c24e..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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
-   */
-	SOAPPackage getSOAPPackage();
-
-} //SOAPFactory
diff --git a/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/soap/SOAPFault.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/soap/SOAPFault.java
deleted file mode 100644
index 8d56bf1..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/org/eclipse/wst/wsdl/binding/soap/SOAPHeader.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/soap/SOAPHeader.java
deleted file mode 100644
index ff9312d..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/org/eclipse/wst/wsdl/binding/soap/SOAPHeaderBase.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/soap/SOAPHeaderBase.java
deleted file mode 100644
index debb9e5..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/org/eclipse/wst/wsdl/binding/soap/SOAPHeaderFault.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/soap/SOAPHeaderFault.java
deleted file mode 100644
index 2d48851..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/org/eclipse/wst/wsdl/binding/soap/SOAPOperation.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/soap/SOAPOperation.java
deleted file mode 100644
index be38dd3..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/org/eclipse/wst/wsdl/binding/soap/SOAPPackage.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/soap/SOAPPackage.java
deleted file mode 100644
index 20fae55..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPAddressImpl.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPAddressImpl.java
deleted file mode 100644
index 1c07d4b..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPAddressImpl.java
+++ /dev/null
@@ -1,250 +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 {
-  /**
-   * 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());
-    }
-  }
-} //SOAPAddressImpl
diff --git a/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPBindingImpl.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPBindingImpl.java
deleted file mode 100644
index 2cfe773..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPBindingImpl.java
+++ /dev/null
@@ -1,310 +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 {
-  /**
-   * 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());
-    }
-  }
-} //SOAPBindingImpl
diff --git a/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPBodyImpl.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPBodyImpl.java
deleted file mode 100644
index 95cdc8d..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPBodyImpl.java
+++ /dev/null
@@ -1,482 +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.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.emf.ecore.util.EObjectResolvingEList;
-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.w3c.dom.Element;
-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.internal.impl.ExtensibilityElementImpl;
-
-import java.util.StringTokenizer;
-import java.util.Iterator;
-
-/**
- * <!-- 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 {
-  /**
-   * 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
-   * @ordered
-   */
-	protected EList 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 = (EList)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;
-    }
-  }
-  */
-} //SOAPBodyImpl
diff --git a/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPFactoryImpl.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPFactoryImpl.java
deleted file mode 100644
index 0fcdae9..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPFaultImpl.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPFaultImpl.java
deleted file mode 100644
index aa28185..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPFaultImpl.java
+++ /dev/null
@@ -1,378 +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.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 {
-  /**
-   * 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_URI_ATTRIBUTE,getNamespaceURI());
-      if (eAttribute == null || eAttribute == SOAPPackage.eINSTANCE.getSOAPFault_Use())
-        niceSetAttribute(theElement,SOAPConstants.USE_ATTRIBUTE,getUse());
-      if (eAttribute == null || eAttribute == SOAPPackage.eINSTANCE.getSOAPFault_EncodingStyles())
-        ; // TBD - handle encodingStyles
-      if (getName() != null)
-      	niceSetAttribute(theElement,SOAPConstants.NAME_ATTRIBUTE,getName()); // Revisit Rose model
-    }
-  }
-
-} //SOAPFaultImpl
diff --git a/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPHeaderBaseImpl.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPHeaderBaseImpl.java
deleted file mode 100644
index 992b050..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPHeaderFaultImpl.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPHeaderFaultImpl.java
deleted file mode 100644
index 38239f0..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPHeaderFaultImpl.java
+++ /dev/null
@@ -1,200 +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.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);
-  }
-
-} //SOAPHeaderFaultImpl
diff --git a/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPHeaderImpl.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPHeaderImpl.java
deleted file mode 100644
index 1cfe517..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPHeaderImpl.java
+++ /dev/null
@@ -1,296 +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(element.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);
-    }
-  }
-
-} //SOAPHeaderImpl
diff --git a/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPOperationImpl.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPOperationImpl.java
deleted file mode 100644
index 70754cf..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPOperationImpl.java
+++ /dev/null
@@ -1,311 +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 {
-  /**
-   * 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());
-    }
-  }
-
-} //SOAPOperationImpl
diff --git a/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPPackageImpl.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPPackageImpl.java
deleted file mode 100644
index 3d25452..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/org/eclipse/wst/wsdl/binding/soap/internal/util/SOAPAdapterFactory.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/soap/internal/util/SOAPAdapterFactory.java
deleted file mode 100644
index f81d2ef..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/soap/internal/util/SOAPAdapterFactory.java
+++ /dev/null
@@ -1,329 +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.WSDLElement;
-
-import org.eclipse.wst.wsdl.binding.soap.*;
-
-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;
-
-/**
- * <!-- 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/org/eclipse/wst/wsdl/binding/soap/internal/util/SOAPConstants.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/soap/internal/util/SOAPConstants.java
deleted file mode 100644
index 7790c31..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/org/eclipse/wst/wsdl/binding/soap/internal/util/SOAPExtensibilityElementFactory.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/soap/internal/util/SOAPExtensibilityElementFactory.java
deleted file mode 100644
index fa2dada..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/org/eclipse/wst/wsdl/binding/soap/internal/util/SOAPSwitch.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/soap/internal/util/SOAPSwitch.java
deleted file mode 100644
index eef3401..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/binding/soap/internal/util/SOAPSwitch.java
+++ /dev/null
@@ -1,352 +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.WSDLElement;
-
-import org.eclipse.wst.wsdl.binding.soap.*;
-
-import javax.wsdl.extensions.ExtensibilityElement;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- 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/org/eclipse/wst/wsdl/internal/extensibility/ExtensibilityElementFactoryDescriptor.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/internal/extensibility/ExtensibilityElementFactoryDescriptor.java
deleted file mode 100644
index 040b799..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/org/eclipse/wst/wsdl/internal/extensibility/ExtensibilityElementFactoryRegistryImpl.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/internal/extensibility/ExtensibilityElementFactoryRegistryImpl.java
deleted file mode 100644
index fbbc014..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/org/eclipse/wst/wsdl/internal/extensibility/ExtensibilityElementFactoryRegistryReader.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/internal/extensibility/ExtensibilityElementFactoryRegistryReader.java
deleted file mode 100644
index ddc5407..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/org/eclipse/wst/wsdl/internal/impl/BindingFaultImpl.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/internal/impl/BindingFaultImpl.java
deleted file mode 100644
index 4ad48d4..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/internal/impl/BindingFaultImpl.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.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
-{
-  /**
-   * 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/org/eclipse/wst/wsdl/internal/impl/BindingImpl.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/internal/impl/BindingImpl.java
deleted file mode 100644
index 54f676b..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/internal/impl/BindingImpl.java
+++ /dev/null
@@ -1,778 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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
-{
-  /**
-   * 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 = getEBindingOperations().iterator();
-    while (iterator.hasNext())
-    {
-      BindingOperation operation = (BindingOperation) iterator.next();
-      Element child = ((BindingOperationImpl) operation).createElement();
-      newElement.appendChild(child);
-    }
-
-    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 = (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/org/eclipse/wst/wsdl/internal/impl/BindingInputImpl.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/internal/impl/BindingInputImpl.java
deleted file mode 100644
index 106abf6..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/internal/impl/BindingInputImpl.java
+++ /dev/null
@@ -1,410 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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
-{
-  /**
-   * 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)
-  {
-    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/org/eclipse/wst/wsdl/internal/impl/BindingOperationImpl.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/internal/impl/BindingOperationImpl.java
deleted file mode 100644
index cd87f52..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/internal/impl/BindingOperationImpl.java
+++ /dev/null
@@ -1,790 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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
-{
-  /**
-   * 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);
-
-    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 iterator = getEBindingFaults().iterator();
-    while (iterator.hasNext())
-    {
-      BindingFault fault = (BindingFault) iterator.next();
-      Element child = ((BindingFaultImpl) fault).createElement();
-      newElement.appendChild(child);
-    }
-
-    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 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/org/eclipse/wst/wsdl/internal/impl/BindingOutputImpl.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/internal/impl/BindingOutputImpl.java
deleted file mode 100644
index 6ebfa4e..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/internal/impl/BindingOutputImpl.java
+++ /dev/null
@@ -1,410 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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
-{
-  /**
-   * 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)
-  {
-    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/org/eclipse/wst/wsdl/internal/impl/DefinitionImpl.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/internal/impl/DefinitionImpl.java
deleted file mode 100644
index 4ac725a..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/internal/impl/DefinitionImpl.java
+++ /dev/null
@@ -1,2280 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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
-{
-  /**
-   * 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 String documentBaseURI;
-  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())
-    {                      
-      setTargetNamespace(changedElement.getAttribute("targetNamespace"));
-      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);
-
-    Object obj = null;
-
-    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());
-    addChildElements(newElement, getEExtensibilityElements());
-
-    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();
-      Namespace namespace = null;
-      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)
-  {
-    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/org/eclipse/wst/wsdl/internal/impl/ExtensibilityElementImpl.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/internal/impl/ExtensibilityElementImpl.java
deleted file mode 100644
index bb84247..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/org/eclipse/wst/wsdl/internal/impl/ExtensibleElementImpl.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/internal/impl/ExtensibleElementImpl.java
deleted file mode 100644
index d3ce61d..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/org/eclipse/wst/wsdl/internal/impl/FaultImpl.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/internal/impl/FaultImpl.java
deleted file mode 100644
index 2f4a24f..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/internal/impl/FaultImpl.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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
-{
-  /**
-   * <!-- 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/org/eclipse/wst/wsdl/internal/impl/ImportImpl.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/internal/impl/ImportImpl.java
deleted file mode 100644
index 5e854f8..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/internal/impl/ImportImpl.java
+++ /dev/null
@@ -1,585 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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
-{
-  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/org/eclipse/wst/wsdl/internal/impl/InputImpl.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/internal/impl/InputImpl.java
deleted file mode 100644
index 297ee08..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/internal/impl/InputImpl.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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
-{
-  /**
-   * <!-- 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/org/eclipse/wst/wsdl/internal/impl/MessageImpl.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/internal/impl/MessageImpl.java
deleted file mode 100644
index 25151d4..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/internal/impl/MessageImpl.java
+++ /dev/null
@@ -1,597 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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
-{
-  /**
-   * 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 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/org/eclipse/wst/wsdl/internal/impl/MessageReferenceImpl.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/internal/impl/MessageReferenceImpl.java
deleted file mode 100644
index 96a7b90..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/org/eclipse/wst/wsdl/internal/impl/NamespaceImpl.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/internal/impl/NamespaceImpl.java
deleted file mode 100644
index e0c28a9..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/org/eclipse/wst/wsdl/internal/impl/OperationImpl.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/internal/impl/OperationImpl.java
deleted file mode 100644
index 973b8d1..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/internal/impl/OperationImpl.java
+++ /dev/null
@@ -1,1139 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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 javax.wsdl.OperationType;
-
-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.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.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
-{
-  /**
-   * 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;
-
-  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()
-  {
-    List ordering = new ArrayList();
-    for (Iterator i = getEParameterOrdering().iterator(); i.hasNext();)
-    {
-      try
-      {
-        Part part = (Part) i.next();
-        ordering.add(part.getName());
-      }
-      catch (Exception e)
-      {
-        // TBD - handle exception
-      }
-    }
-    return ordering.isEmpty() ? null : ordering;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setParameterOrdering(List parameterOrder)
-  {
-    getEParameterOrdering().clear();
-    if (parameterOrder != null)
-    {
-      for (Iterator i = parameterOrder.iterator(); i.hasNext();)
-      {
-        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)
-  {
-    String name = changedElement.getAttribute("name");
-    if (name != null)
-    {
-      setName(name);
-    }
-  }
-
-  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
-      }
-    }
-  }
-  
-  // Switch <input> and <output>
-  private void reorderChildren()
-  {
-    NodeList nodeList = getElement().getChildNodes(); // There are children.
-    
-    // Find out the positions of <input> and <output>
-    Node current = null;
-    Node input = null;
-    Node output = null;
-    Node reference = null;
-    for (int i=0; i<nodeList.getLength(); i++)
-    {
-      current = nodeList.item(i);
-      if (current.getNodeType() == Node.ELEMENT_NODE)
-      {
-      	if (WSDLConstants.INPUT == WSDLUtil.getInstance().getWSDLType((Element)current))
-        {
-          input = current;
-          if (output != null)
-            reference = nodeList.item(i+1);
-        }
-        else if (WSDLConstants.OUTPUT == WSDLUtil.getInstance().getWSDLType((Element)current))
-        {
-          output = current;
-          if (input != null)
-            reference = nodeList.item(i+1);
-        }
-      }
-    } // end for
-    
-    if (input != null && output != null && reference != 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/org/eclipse/wst/wsdl/internal/impl/OutputImpl.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/internal/impl/OutputImpl.java
deleted file mode 100644
index 0ec7639..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/internal/impl/OutputImpl.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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
-{
-  /**
-   * <!-- 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/org/eclipse/wst/wsdl/internal/impl/PartImpl.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/internal/impl/PartImpl.java
deleted file mode 100644
index 6d59b0b..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/internal/impl/PartImpl.java
+++ /dev/null
@@ -1,751 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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
-{
-  /**
-   * 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
-  {
-    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/org/eclipse/wst/wsdl/internal/impl/PortImpl.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/internal/impl/PortImpl.java
deleted file mode 100644
index 0830949..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/internal/impl/PortImpl.java
+++ /dev/null
@@ -1,431 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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
-{
-  /**
-   * 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/org/eclipse/wst/wsdl/internal/impl/PortTypeImpl.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/internal/impl/PortTypeImpl.java
deleted file mode 100644
index f36ca94..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/internal/impl/PortTypeImpl.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.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
-{
-  /**
-   * 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/org/eclipse/wst/wsdl/internal/impl/ServiceImpl.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/internal/impl/ServiceImpl.java
deleted file mode 100644
index f5be8d2..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/internal/impl/ServiceImpl.java
+++ /dev/null
@@ -1,621 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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
-{
-  /**
-   * 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 = getEPorts().iterator();
-    while (iterator.hasNext())
-    {
-      Port port = (Port) iterator.next();
-      Element child = ((PortImpl) port).createElement();
-      newElement.appendChild(child);
-    }
-
-    iterator = getExtensibilityElements().iterator();
-    while (iterator.hasNext())
-    {
-      ExtensibilityElement extensibilityElement = (ExtensibilityElement) iterator.next();
-      Element child = ((ExtensibilityElementImpl) extensibilityElement).createElement();
-      newElement.appendChild(child);
-    }
-
-    return newElement;
-  }
-
-} //ServiceImpl
diff --git a/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/internal/impl/TypesImpl.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/internal/impl/TypesImpl.java
deleted file mode 100644
index 26d8b3e..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/internal/impl/TypesImpl.java
+++ /dev/null
@@ -1,323 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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
-{
-  /**
-   * <!-- 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.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/org/eclipse/wst/wsdl/internal/impl/UnknownExtensibilityElementImpl.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/internal/impl/UnknownExtensibilityElementImpl.java
deleted file mode 100644
index b2ddd0c..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/org/eclipse/wst/wsdl/internal/impl/WSDLElementImpl.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/internal/impl/WSDLElementImpl.java
deleted file mode 100644
index 1ea7ae9..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/internal/impl/WSDLElementImpl.java
+++ /dev/null
@@ -1,1477 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.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 (feature == WSDLPackage.eINSTANCE.getDefinition_ENamespaces())
-      {
-        //System.out.println("eNotify: namespaces");
-      }
-      else if (eReference.isContainment() && !eReference.isTransient())
-      {
-        switch (eventType)
-        {
-          case Notification.ADD :
-          {
-            if (newValue instanceof WSDLElement)
-              adoptContent(eReference, (WSDLElement) 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);
-      }
-    }
-  }
-
-  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())
-        {
-          referencedElement = ((WSDLElement)contents.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/org/eclipse/wst/wsdl/internal/impl/WSDLFactoryImpl.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/internal/impl/WSDLFactoryImpl.java
deleted file mode 100644
index c6cdfd3..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/org/eclipse/wst/wsdl/internal/impl/WSDLPackageImpl.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/internal/impl/WSDLPackageImpl.java
deleted file mode 100644
index 4cec4c4..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/internal/impl/WSDLPackageImpl.java
+++ /dev/null
@@ -1,2507 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.xsd.XSDPackage;
-import org.eclipse.xsd.impl.XSDPackageImpl;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-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;
-
-/**
- * <!-- 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/org/eclipse/wst/wsdl/internal/impl/XSDSchemaExtensibilityElementImpl.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/internal/impl/XSDSchemaExtensibilityElementImpl.java
deleted file mode 100644
index 0c51ce6..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/internal/impl/XSDSchemaExtensibilityElementImpl.java
+++ /dev/null
@@ -1,415 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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);
-    if (getSchema() == null)
-      return;
-    
-    // cs... why do we need to do this? isn't the schema taking care of this itself?
-    //
-    if (changedElement.hasAttribute(XSDConstants.SCHEMALOCATION_ATTRIBUTE))
-      	getSchema().setSchemaLocation(changedElement.getAttribute(XSDConstants.SCHEMALOCATION_ATTRIBUTE));
-    if (changedElement.hasAttribute(XSDConstants.NAMESPACE_ATTRIBUTE))
-    	getSchema().setSchemaLocation(changedElement.getAttribute(XSDConstants.NAMESPACE_ATTRIBUTE));
-  }
-  
-  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 element;
-    }
-    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;
-
-    if (eAttribute == null || eAttribute == WSDLPackage.eINSTANCE.getXSDSchemaExtensibilityElement_Schema())
-    {
-      // We got a new schema so re-parent it.
-      schema.setDocument(null);
-      schema.setElement(null);
-      adopt(schema);
-      schema.updateElement();
-    }
-    
-    if (eAttribute == null || eAttribute == WSDLPackage.eINSTANCE.getWSDLElement_Element())
-    {
-      // Are we creating a schema too many times?
-      setSchema(createSchema(element)); // element is not null
-    }    
-  }
-} //XSDSchemaExtensibilityElementImpl
diff --git a/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/internal/impl/wsdl4j/WSDLFactoryImpl.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/internal/impl/wsdl4j/WSDLFactoryImpl.java
deleted file mode 100644
index b1bb180..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/org/eclipse/wst/wsdl/internal/impl/wsdl4j/WSDLReaderImpl.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/internal/impl/wsdl4j/WSDLReaderImpl.java
deleted file mode 100644
index 3838d79..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/org/eclipse/wst/wsdl/internal/impl/wsdl4j/WSDLWriterImpl.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/internal/impl/wsdl4j/WSDLWriterImpl.java
deleted file mode 100644
index 9baf152..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/org/eclipse/wst/wsdl/internal/util/Reconcilable.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/internal/util/Reconcilable.java
deleted file mode 100644
index b9d2a90..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/org/eclipse/wst/wsdl/internal/util/WSDLAdapterFactory.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/internal/util/WSDLAdapterFactory.java
deleted file mode 100644
index e7c620a..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/org/eclipse/wst/wsdl/internal/util/WSDLDefinitionFactory.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/internal/util/WSDLDefinitionFactory.java
deleted file mode 100644
index 09ef532..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/org/eclipse/wst/wsdl/internal/util/WSDLModelLocator.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/internal/util/WSDLModelLocator.java
deleted file mode 100644
index c19b0c4..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/org/eclipse/wst/wsdl/internal/util/WSDLResourceFactoryImpl.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/internal/util/WSDLResourceFactoryImpl.java
deleted file mode 100644
index c3986a6..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/org/eclipse/wst/wsdl/internal/util/WSDLSwitch.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/internal/util/WSDLSwitch.java
deleted file mode 100644
index f860668..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/org/eclipse/wst/wsdl/internal/util/WSDLUtil.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/internal/util/WSDLUtil.java
deleted file mode 100644
index da79b04..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/org/eclipse/wst/wsdl/internal/util/XSDSchemaLocatorAdapterFactory.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/internal/util/XSDSchemaLocatorAdapterFactory.java
deleted file mode 100644
index 8e4ee81..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/org/eclipse/wst/wsdl/internal/util/XSDSchemaLocatorImpl.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/internal/util/XSDSchemaLocatorImpl.java
deleted file mode 100644
index 1833595..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/org/eclipse/wst/wsdl/util/ExtensibilityElementFactory.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/util/ExtensibilityElementFactory.java
deleted file mode 100644
index f17c690..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/org/eclipse/wst/wsdl/util/ExtensibilityElementFactoryRegistry.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/util/ExtensibilityElementFactoryRegistry.java
deleted file mode 100644
index d8528ca..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/org/eclipse/wst/wsdl/util/WSDLConstants.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/util/WSDLConstants.java
deleted file mode 100644
index 3fb94d5..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/org/eclipse/wst/wsdl/util/WSDLResourceImpl.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/util/WSDLResourceImpl.java
deleted file mode 100644
index 85d8555..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/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/rose/WSDL.mdl b/bundles/org.eclipse.wst.wsdl/src/rose/WSDL.mdl
deleted file mode 100644
index 3a25818..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/rose/WSDL.mdl
+++ /dev/null
@@ -1,30748 +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 "$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"

-				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"

-				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"

-				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, 1000)

-					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))))))))

-	    (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  	482

-				    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  	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 "" @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  	592

-				    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  	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" @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  	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" @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  	506

-				    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  	199

-				    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  	202

-				    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  	236

-				    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  	202

-				    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  	1357

-				    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  	254

-				    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  	258

-				    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  	598

-				    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  	202

-				    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  	382

-				    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  	446

-				    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  	225

-				    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  	198

-				    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  	723

-				    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  	588

-				    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  	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" @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  	852

-				    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  	378

-				    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  	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" @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  	722

-				    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  	423

-				    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  	769

-				    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  	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" @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  	363

-				    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  	363

-				    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  	538

-				    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  	508

-				    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/rose/com.ibm.etools.WSDL.cat b/bundles/org.eclipse.wst.wsdl/src/rose/com.ibm.etools.WSDL.cat
deleted file mode 100644
index 49fb469..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/rose/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/rose/com.ibm.etools.wsdl.bindings.HTTP.cat b/bundles/org.eclipse.wst.wsdl/src/rose/com.ibm.etools.wsdl.bindings.HTTP.cat
deleted file mode 100644
index 8202883..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/rose/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/rose/com.ibm.etools.wsdl.bindings.MIME.cat b/bundles/org.eclipse.wst.wsdl/src/rose/com.ibm.etools.wsdl.bindings.MIME.cat
deleted file mode 100644
index 2845a10..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/rose/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/rose/com.ibm.etools.wsdl.bindings.SOAP.cat b/bundles/org.eclipse.wst.wsdl/src/rose/com.ibm.etools.wsdl.bindings.SOAP.cat
deleted file mode 100644
index 4a6ebdc..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/rose/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/rose/http.mdl b/bundles/org.eclipse.wst.wsdl/src/rose/http.mdl
deleted file mode 100644
index a2ce791..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/rose/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/rose/mime.mdl b/bundles/org.eclipse.wst.wsdl/src/rose/mime.mdl
deleted file mode 100644
index 243c220..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/rose/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/rose/soap.mdl b/bundles/org.eclipse.wst.wsdl/src/rose/soap.mdl
deleted file mode 100644
index 07993ea..0000000
--- a/bundles/org.eclipse.wst.wsdl/src/rose/soap.mdl
+++ /dev/null
@@ -1,31708 +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, 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, 1000)

-					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))))))))

-	    (object Class_Category "soap"

-		is_unit    	TRUE

-		is_loaded  	FALSE

-		file_name  	"$VABASE_PLUGINS_PATH\\com.ibm.etools.wsdl.bindings\\src\\rose\\com.ibm.etools.wsdl.bindings.SOAP.cat"

-		quid       	"3A01CF0C01A2")

-	    (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" @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$128" @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$129" @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$160" @428

-				location   	(2229, 1112)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3B683C890122"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$161" @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$148" @435

-				location   	(2219, 880)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3B683606026F"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$149" @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$194" @443

-				location   	(590, 1140)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3B6D35AB0273"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$195" @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$96" @449

-				location   	(1119, 1112)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3B6837DF024F"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$97" @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$102" @454

-				location   	(1455, 982)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3B6851BA0126"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$103" @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$98" @459

-				location   	(921, 1208)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3B683959006E"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$99" @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$152" @467

-				location   	(2216, 608)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3B6837AC025A"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$153" @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$82" @473

-				location   	(1676, 1208)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3B6887BF0150"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$83" @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$78" @478

-				location   	(1429, 1438)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3B68359F0086"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$79" @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$86" @484

-				location   	(777, 1425)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3B683585010D"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$87" @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$70" @489

-				location   	(237, 1208)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3B68356B02CB"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$71" @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$92" @495

-				location   	(728, 775)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3B6833350340"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$93" @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$134" @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$135" @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$138" @506

-				location   	(1197, 608)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3B6D8D330025"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$139" @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$136" @511

-				location   	(1415, 608)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3B6D8D3D003E"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$137" @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$180" @517

-				location   	(2395, 606)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3B66EEA7023E"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$181" @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$176" @522

-				location   	(1772, 249)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3B66EEFF024F"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$177" @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$172" @527

-				location   	(2346, 518)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3B66EE920216"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$173" @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$174" @533

-				location   	(203, 159)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3B66EE760049"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$175" @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$178" @538

-				location   	(1087, 329)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3BFC2A1701ED"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$179" @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$170" @543

-				location   	(48, 320)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3B66FDFA00C3"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$171" @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$120" @549

-				location   	(499, 589)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3B69C0590198"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$121" @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$114" @554

-				location   	(241, 613)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3B68338C0058"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$115" @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$116" @559

-				location   	(837, 460)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3B6833EF0160"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$117" @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$168" @564

-				location   	(541, 246)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3B66EE8D01BF"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$169" @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$122" @569

-				location   	(353, 621)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3C42DBDD0297"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$123" @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  	482

-				    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  	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 "" @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  	592

-				    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  	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" @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  	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" @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  	506

-				    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  	199

-				    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  	202

-				    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  	236

-				    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  	202

-				    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  	1357

-				    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  	254

-				    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  	258

-				    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  	598

-				    compartmentItems 	(list Compartment

-					"+ variety : XSDVariety"

-					"<<0..*>> + final : XSDSimpleFinal"))

-				width      	656

-				height     	250

-				annotation 	8

-				autoResize 	TRUE)

-			    (object AssociationViewNew "$UNNAMED$126" @673

-				location   	(775, 178)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3B6D597102EA"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$127" @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$188" @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$189" @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$230" @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$231" @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$190" @692

-				location   	(1729, 574)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3B6C34B70208"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$191" @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$192" @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$193" @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$194" @704

-				location   	(1175, 396)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3B6D35AB0273"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$195" @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$196" @710

-				location   	(1360, 446)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3B6D5572016C"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$197" @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  	202

-				    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$132" @745

-				location   	(865, 1359)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3B69DB0D0183"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$133" @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$156" @750

-				location   	(713, 709)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3B69DB0F0212"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$157" @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$150" @755

-				location   	(719, 1193)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3B69DB15008A"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$151" @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$110" @760

-				location   	(785, 550)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3B69DB0A0066"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$111" @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$182" @765

-				location   	(1184, 404)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3B69E4560290"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$183" @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$198" @770

-				location   	(1752, 1034)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3B69E2910158"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$199" @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$200" @775

-				location   	(1896, 881)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3B9006CF0088"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$201" @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$202" @780

-				location   	(2040, 715)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3B69DB330264"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$203" @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$220" @785

-				location   	(668, 865)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3C239134004F"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$221" @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$124" @790

-				location   	(1472, 167)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3B6D23B901CD"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$125" @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$74" @795

-				location   	(927, 350)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3B69DB060291"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$75" @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$66" @800

-				location   	(1027, 222)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3B69DADC02F5"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$67" @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$90" @805

-				location   	(1494, 1438)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3B90068801C2"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$91" @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$144" @810

-				location   	(637, 1022)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3B69DB1702C8"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$145" @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$64" @815

-				location   	(1581, 607)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3C626EA70102"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$65" @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$204" @820

-				location   	(849, 1496)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3B69DB11026F"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$205" @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$206" @825

-				location   	(952, 1565)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3C626EB30005"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$207" @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$142" @841

-				location   	(1368, 1206)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3B6ADCC5007E"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$143" @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$140" @846

-				location   	(1168, 1022)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3B6ADCD802FC"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$141" @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$162" @851

-				location   	(1563, 1353)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3B6ADE42009A"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$163" @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$104" @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$105" @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$106" @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$107" @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$218" @889

-				location   	(1382, 1425)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3C21DD0C03DB"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$219" @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$216" @894

-				location   	(1505, 1503)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3C21DCC700EC"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$217" @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$108" @899

-				location   	(66, 244)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3B751C310356"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$109" @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  	382

-				    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  	446

-				    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  	225

-				    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  	198

-				    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  	723

-				    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  	588

-				    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  	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" @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  	852

-				    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  	378

-				    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  	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" @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$164" @968

-				location   	(2125, 680)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3B6AE8240051"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$165" @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$152" @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$153" @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$146" @984

-				location   	(122, 1136)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3B6BCEB102F8"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$147" @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$158" @990

-				location   	(47, 885)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3B6B47150119"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$159" @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$88" @997

-				location   	(1319, 1034)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3B6F1DE9018A"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$89" @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$184" @1004

-				location   	(1351, 1840)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3B6D5CA50112"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$185" @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$68" @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$69" @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$186" @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$187" @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$166" @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$167" @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$112" @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$113" @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$116" @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$117" @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$136" @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$137" @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$138" @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$139" @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$94" @1066

-				location   	(1614, 1868)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3B6FDDD70113"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$95" @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$100" @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$101" @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$76" @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$77" @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$208" @1085

-				location   	(1252, 1896)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3BEBDC870247"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$209" @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$80" @1090

-				location   	(1199, 1321)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3C275D320220"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$81" @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$118" @1129

-				location   	(228, 1695)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3B6B41E60251"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$119" @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$154" @1136

-				location   	(952, 1698)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3B6B42450398"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$155" @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$218" @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$219" @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$216" @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$217" @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$222" @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$223" @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$224" @1163

-				location   	(75, 188)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3C25ECF0005E"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$225" @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$226" @1168

-				location   	(1262, 134)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3C25ED0B011B"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$227" @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$228" @1173

-				location   	(126, 656)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3C25EEAB001F"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$229" @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$232" @1178

-				location   	(642, 126)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3C2784730194"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$233" @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$72" @1185

-				location   	(234, 1340)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3B6B426B0194"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$73" @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$306" @1193

-				location   	(1668, 280)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3D4BB4AE01CC"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$307" @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$308" @1200

-				location   	(1508, 792)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3D4BB4D3028E"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$309" @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$84" @1206

-				location   	(919, 1349)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3B6B425E01F9"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$85" @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$310" @1213

-				location   	(2025, 792)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3D4BB4D901F6"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$311" @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$312" @1218

-				location   	(1754, 1178)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3D4C68FF01BF"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$313" @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$214" @1228

-				location   	(144, 283)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3BFE6431035F"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$215" @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$210" @1233

-				location   	(1028, 440)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3BFE622703CD"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$211" @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$212" @1238

-				location   	(688, 282)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3BFE62690165"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$213" @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$236" @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$237" @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  	722

-				    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  	423

-				    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  	769

-				    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  	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" @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  	363

-				    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  	363

-				    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  	538

-				    compartmentItems 	(list Compartment

-					"<<0..*>> + validFacets : String"))

-				width      	594

-				height     	136

-				annotation 	8

-				autoResize 	TRUE)

-			    (object AssociationViewNew "$UNNAMED$248" @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$249" @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$252" @1288

-				location   	(1733, 1575)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3C28B08D0252"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$253" @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$254" @1293

-				location   	(1587, 1793)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3C28B0AB0396"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$255" @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$256" @1298

-				location   	(937, 1787)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3C28B0AF0338"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$257" @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$258" @1303

-				location   	(981, 1937)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3C28B0B30207"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$259" @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$260" @1308

-				location   	(1469, 1953)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3C28B0B6028D"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$261" @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$262" @1313

-				location   	(1122, 2180)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3C28B0BC0051"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$263" @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$266" @1318

-				location   	(1084, 1989)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3C28B0C2021D"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$267" @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$268" @1323

-				location   	(1451, 2074)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3C28B0C50159"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$269" @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$270" @1328

-				location   	(1827, 1400)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3C28B0C802A7"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$271" @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$280" @1333

-				location   	(1262, 2413)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3C28B0DB0377"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$281" @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$284" @1338

-				location   	(1841, 1306)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3C28B0E300D9"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$285" @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$264" @1343

-				location   	(1328, 2186)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3C28B0BF018C"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$265" @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$282" @1348

-				location   	(674, 1390)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3C28B0DF0048"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$283" @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$272" @1353

-				location   	(687, 1296)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3C28B0CB039C"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$273" @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$286" @1358

-				location   	(1689, 1662)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3C28B44401EC"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$287" @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$288" @1363

-				location   	(1328, 2258)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3C28B54F0145"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$289" @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$290" @1368

-				location   	(1297, 2366)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3C28B5C4011C"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$291" @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$292" @1373

-				location   	(1262, 2449)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3C28B62A00AA"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$293" @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$294" @1378

-				location   	(1422, 2159)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3C28B6B003A6"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$295" @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$296" @1383

-				location   	(1084, 2083)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3C28B7CA026B"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$297" @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$302" @1388

-				location   	(1122, 2241)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3C28B8DC0052"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$303" @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$250" @1393

-				location   	(773, 1565)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3C28B085025B"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$251" @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$304" @1398

-				location   	(816, 1650)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3C28B97001DB"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$305" @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$274" @1403

-				location   	(1297, 2321)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3C28B0CF0199"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$275" @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$276" @1408

-				location   	(1159, 2273)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3C28B0D500C5"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$277" @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$300" @1413

-				location   	(1197, 2334)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3C28B898016D"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$301" @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$298" @1418

-				location   	(1231, 2438)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3C28B8400062"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$299" @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$278" @1423

-				location   	(1231, 2397)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3C28B0D800DE"

-				roleview_list 	(list RoleViews

-				    (object RoleView "$UNNAMED$279" @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$234" @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$235" @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$240" @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$241" @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$242" @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$243" @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$246" @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$247" @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$244" @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$245" @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  	508

-				    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$238" @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$239" @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$130" @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$131" @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::soap" @1475

-			location   	(704, 256)

-			label      	(object ItemLabel

-			    Parent_View 	@1475

-			    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" @1476

-			location   	(1152, 256)

-			label      	(object ItemLabel

-			    Parent_View 	@1476

-			    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.wsi.ui/.classpath b/bundles/org.eclipse.wst.wsi.ui/.classpath
deleted file mode 100644
index 275b34c..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.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<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 eb450a7..0000000
--- a/bundles/org.eclipse.wst.wsi.ui/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-temp.folder
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/build.properties b/bundles/org.eclipse.wst.wsi.ui/build.properties
deleted file mode 100644
index 9adcfa0..0000000
--- a/bundles/org.eclipse.wst.wsi.ui/build.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-bin.includes = wsiui.jar,\
-               plugin.properties,\
-               plugin.xml,\
-               icons/
-source.wsiui.jar = src/
-jars.compile.order = wsiui.jar
-output.wsiui.jar = bin/
-src.includes = icons/,\
-               plugin.properties,\
-               plugin.xml,\
-               src/,\
-               build.properties
diff --git a/bundles/org.eclipse.wst.wsi.ui/build.xml b/bundles/org.eclipse.wst.wsi.ui/build.xml
deleted file mode 100644
index 1b97d00..0000000
--- a/bundles/org.eclipse.wst.wsi.ui/build.xml
+++ /dev/null
@@ -1,269 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.wst.wsi.ui" 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">
-			<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 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_1.0.0.jar" basedir="${temp.folder}/org.eclipse.wst.wsi.ui_1.0.0" filesonly="false" whenempty="skip" update="false"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="wsiui.jar" depends="init" unless="wsiui.jar" description="Create jar: org.eclipse.wst.wsi.ui wsiui.jar.">
-		<delete dir="${temp.folder}/wsiui.jar.bin"/>
-		<mkdir dir="${temp.folder}/wsiui.jar.bin"/>
-		<!-- compile the source code -->
-		<javac destdir="${temp.folder}/wsiui.jar.bin" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bootclasspath}" source="${javacSource}" target="${javacTarget}"		>
-			<compilerarg line="${compilerArg}"/>
-			<classpath>
-				<pathelement path="../../plugins/org.eclipse.jface.text_3.1.0/jfacetext.jar"/>
-				<pathelement path="..\..\plugins\org.eclipse.core.runtime_3.1.0.jar"/>
-				<pathelement path="..\..\plugins\org.eclipse.osgi_3.1.0.jar"/>
-				<pathelement path="../../plugins/org.eclipse.text_3.1.0/text.jar"/>
-				<pathelement path="..\..\plugins\org.eclipse.swt_3.1.0.jar"/>
-				<pathelement path="..\..\plugins\org.eclipse.swt.win32_3.1.0.jar"/>
-				<pathelement path="..\..\plugins\org.eclipse.jface_3.1.0.jar"/>
-				<pathelement path="..\..\plugins\org.eclipse.core.commands_3.1.0.jar"/>
-				<pathelement path="../../plugins/org.eclipse.core.resources_3.1.0/resources.jar"/>
-				<pathelement path="../../plugins/org.eclipse.core.resources.compatibility_3.1.0/resources.jar"/>
-				<pathelement path="../../plugins/org.eclipse.core.resources.compatibility_3.1.0/compatibility.jar"/>
-				<pathelement path="../../plugins/org.eclipse.core.resources.win32_3.0.0/resources.jar"/>
-				<pathelement path="../../plugins/org.eclipse.core.resources.win32_3.0.0/resources-win32.jar"/>
-				<pathelement path="../../plugins/org.eclipse.core.runtime.compatibility_3.1.0/compatibility.jar"/>
-				<pathelement path="..\..\plugins\org.eclipse.update.configurator_3.1.0.jar"/>
-				<pathelement path="..\..\plugins\org.eclipse.ui_3.1.0.jar"/>
-				<pathelement path="..\..\plugins\org.eclipse.help_3.1.0.jar"/>
-				<pathelement path="..\..\plugins\org.eclipse.ui.workbench_3.1.0.jar"/>
-				<pathelement path="../../plugins/org.eclipse.ui.workbench.compatibility_3.1.0/compatibility.jar"/>
-				<pathelement path="../../plugins/org.eclipse.ui.workbench.compatibility_3.1.0/@dot"/>
-				<pathelement path="..\..\plugins\org.eclipse.core.expressions_3.1.0.jar"/>
-				<pathelement path="..\..\plugins\org.eclipse.ui.ide_3.1.0.jar"/>
-				<pathelement path="..\..\plugins\org.eclipse.ui.win32_3.1.0.jar"/>
-				<pathelement path="..\..\plugins\org.eclipse.ui.views_3.1.0.jar"/>
-				<pathelement path="..\..\plugins\org.eclipse.update.core_3.1.0.jar"/>
-				<pathelement path="../../plugins/org.eclipse.update.core.win32_3.1.0/@dot"/>
-				<pathelement path="..\..\plugins\org.eclipse.update.ui_3.1.0.jar"/>
-				<pathelement path="..\..\plugins\org.eclipse.ui.forms_3.1.0.jar"/>
-				<pathelement path="../../plugins/org.eclipse.ui.editors_3.1.0/editors.jar"/>
-				<pathelement path="../../plugins/org.eclipse.ui.workbench.texteditor_3.1.0/texteditor.jar"/>
-				<pathelement path="../../plugins/org.eclipse.core.filebuffers_3.1.0/filebuffers.jar"/>
-				<pathelement path="../../plugins/org.eclipse.debug.core_3.1.0/dtcore.jar"/>
-				<pathelement path="../../plugins/org.eclipse.core.variables_3.1.0/variables.jar"/>
-				<pathelement path="../../plugins/org.eclipse.wst.common.ui_1.0.0/ui.jar"/>
-				<pathelement path="../../plugins/org.eclipse.wst.validation_1.0.0/validate.jar"/>
-				<pathelement path="../../plugins/org.eclipse.wst.validation_1.0.0/common.jar"/>
-				<pathelement path="../../plugins/org.eclipse.wst.common.frameworks_1.0.0/common.jar"/>
-				<pathelement path="../../plugins/org.eclipse.wst.common.frameworks_1.0.0/common_core.jar"/>
-				<pathelement path="../../plugins/org.eclipse.jem.util_1.1.0/util.jar"/>
-				<pathelement path="../../plugins/org.eclipse.emf.ecore_2.1.0/runtime/ecore.jar"/>
-				<pathelement path="../../plugins/org.eclipse.emf.common_2.1.0/runtime/common.jar"/>
-				<pathelement path="../../plugins/org.eclipse.emf.ecore.xmi_2.1.0/runtime/ecore.xmi.jar"/>
-				<pathelement path="../../plugins/org.eclipse.jdt.core_3.1.0/jdtcore.jar"/>
-				<pathelement path="../../plugins/org.apache.ant_1.6.2/lib/ant.jar"/>
-				<pathelement path="../../plugins/org.apache.ant_1.6.2/lib/ant-antlr.jar"/>
-				<pathelement path="../../plugins/org.apache.ant_1.6.2/lib/ant-apache-bcel.jar"/>
-				<pathelement path="../../plugins/org.apache.ant_1.6.2/lib/ant-apache-bsf.jar"/>
-				<pathelement path="../../plugins/org.apache.ant_1.6.2/lib/ant-apache-log4j.jar"/>
-				<pathelement path="../../plugins/org.apache.ant_1.6.2/lib/ant-apache-oro.jar"/>
-				<pathelement path="../../plugins/org.apache.ant_1.6.2/lib/ant-apache-regexp.jar"/>
-				<pathelement path="../../plugins/org.apache.ant_1.6.2/lib/ant-apache-resolver.jar"/>
-				<pathelement path="../../plugins/org.apache.ant_1.6.2/lib/ant-commons-logging.jar"/>
-				<pathelement path="../../plugins/org.apache.ant_1.6.2/lib/ant-commons-net.jar"/>
-				<pathelement path="../../plugins/org.apache.ant_1.6.2/lib/ant-icontract.jar"/>
-				<pathelement path="../../plugins/org.apache.ant_1.6.2/lib/ant-jai.jar"/>
-				<pathelement path="../../plugins/org.apache.ant_1.6.2/lib/ant-javamail.jar"/>
-				<pathelement path="../../plugins/org.apache.ant_1.6.2/lib/ant-jdepend.jar"/>
-				<pathelement path="../../plugins/org.apache.ant_1.6.2/lib/ant-jmf.jar"/>
-				<pathelement path="../../plugins/org.apache.ant_1.6.2/lib/ant-jsch.jar"/>
-				<pathelement path="../../plugins/org.apache.ant_1.6.2/lib/ant-junit.jar"/>
-				<pathelement path="../../plugins/org.apache.ant_1.6.2/lib/ant-launcher.jar"/>
-				<pathelement path="../../plugins/org.apache.ant_1.6.2/lib/ant-netrexx.jar"/>
-				<pathelement path="../../plugins/org.apache.ant_1.6.2/lib/ant-nodeps.jar"/>
-				<pathelement path="../../plugins/org.apache.ant_1.6.2/lib/ant-starteam.jar"/>
-				<pathelement path="../../plugins/org.apache.ant_1.6.2/lib/ant-stylebook.jar"/>
-				<pathelement path="../../plugins/org.apache.ant_1.6.2/lib/ant-swing.jar"/>
-				<pathelement path="../../plugins/org.apache.ant_1.6.2/lib/ant-trax.jar"/>
-				<pathelement path="../../plugins/org.apache.ant_1.6.2/lib/ant-vaj.jar"/>
-				<pathelement path="../../plugins/org.apache.ant_1.6.2/lib/ant-weblogic.jar"/>
-				<pathelement path="../../plugins/org.apache.ant_1.6.2/lib/ant-xalan1.jar"/>
-				<pathelement path="../../plugins/org.apache.ant_1.6.2/lib/ant-xslp.jar"/>
-				<pathelement path="../../plugins/org.eclipse.team.core_3.1.0/team.jar"/>
-				<pathelement path="../../plugins/org.eclipse.wst.xml.validation_1.0.0/runtime/validatexml.jar"/>
-				<pathelement path="../../plugins/org.eclipse.wst.xml.validation_1.0.0/jars/xercesImpl.jar"/>
-				<pathelement path="../../plugins/org.eclipse.wst.xml.validation_1.0.0/jars/xmlParserAPIs.jar"/>
-				<pathelement path="../../plugins/org.eclipse.wst.common.uriresolver_1.0.0/uriresolver.jar"/>
-				<pathelement path="../../plugins/org.eclipse.wst.wsdl.validation_1.0.0/wsdlvalidateui.jar"/>
-				<pathelement path="../../plugins/org.eclipse.wst.wsdl.validation_1.0.0/wsdlvalidate.jar"/>
-				<pathelement path="../../plugins/org.eclipse.wst.wsdl.validation_1.0.0/lib/wsdl4j.jar"/>
-				<pathelement path="../../plugins/org.eclipse.wst.wsdl.validation_1.0.0/lib/qname.jar"/>
-				<pathelement path="../../plugins/org.eclipse.wst.common.dependencychecker_1.0.0/dependencychecker.jar"/>
-				<pathelement path="../org.eclipse.wst.wsi/bin"/>
-				<pathelement path="../org.eclipse.wst.wsi/wsicore.jar"/>
-				<pathelement path="../org.eclipse.wst.wsi/wsivalidate.jar"/>
-				<pathelement path="../../plugins/org.eclipse.wst.command.env_1.0.0/env.jar"/>
-				<pathelement path="../../plugins/org.eclipse.wst.command.env.core_1.0.0/envcore.jar"/>
-				<pathelement path="../../plugins/org.eclipse.wst.command.env.ui_1.0.0/envui.jar"/>
-				<pathelement path="../../plugins/org.eclipse.wst.ws.uddi4j_1.0.0/lib/uddi4j.jar"/>
-				<pathelement path="../../plugins/org.eclipse.wst.ws.apache.axis_1.0.0/lib/axis-ant.jar"/>
-				<pathelement path="../../plugins/org.eclipse.wst.ws.apache.axis_1.0.0/lib/axis.jar"/>
-				<pathelement path="../../plugins/org.eclipse.wst.ws.apache.axis_1.0.0/lib/commons-discovery.jar"/>
-				<pathelement path="../../plugins/org.eclipse.wst.ws.apache.axis_1.0.0/lib/jaxrpc.jar"/>
-				<pathelement path="../../plugins/org.eclipse.wst.ws.apache.axis_1.0.0/lib/log4j-1.2.8.jar"/>
-				<pathelement path="../../plugins/org.eclipse.wst.ws.apache.axis_1.0.0/lib/saaj.jar"/>
-				<pathelement path="../../plugins/org.eclipse.wst.ws.apache.axis_1.0.0/lib/wsdl4j.jar"/>
-				<pathelement path="../../plugins/org.eclipse.tomcat_4.1.30.1/tomcatwrapper.jar"/>
-				<pathelement path="../../plugins/org.eclipse.tomcat_4.1.30.1/catalina.jar"/>
-				<pathelement path="../../plugins/org.eclipse.tomcat_4.1.30.1/bootstrap.jar"/>
-				<pathelement path="../../plugins/org.eclipse.tomcat_4.1.30.1/commons-beanutils.jar"/>
-				<pathelement path="../../plugins/org.eclipse.tomcat_4.1.30.1/commons-collections.jar"/>
-				<pathelement path="../../plugins/org.eclipse.tomcat_4.1.30.1/commons-digester.jar"/>
-				<pathelement path="../../plugins/org.eclipse.tomcat_4.1.30.1/commons-logging.jar"/>
-				<pathelement path="../../plugins/org.eclipse.tomcat_4.1.30.1/commons-logging-api.jar"/>
-				<pathelement path="../../plugins/org.eclipse.tomcat_4.1.30.1/commons-modeler.jar"/>
-				<pathelement path="../../plugins/org.eclipse.tomcat_4.1.30.1/jakarta-regexp-1.3.jar"/>
-				<pathelement path="../../plugins/org.eclipse.tomcat_4.1.30.1/jasper-compiler.jar"/>
-				<pathelement path="../../plugins/org.eclipse.tomcat_4.1.30.1/jasper-runtime.jar"/>
-				<pathelement path="../../plugins/org.eclipse.tomcat_4.1.30.1/mx4j-jmx.jar"/>
-				<pathelement path="../../plugins/org.eclipse.tomcat_4.1.30.1/naming-common.jar"/>
-				<pathelement path="../../plugins/org.eclipse.tomcat_4.1.30.1/naming-factory.jar"/>
-				<pathelement path="../../plugins/org.eclipse.tomcat_4.1.30.1/naming-resources.jar"/>
-				<pathelement path="../../plugins/org.eclipse.tomcat_4.1.30.1/servlet.jar"/>
-				<pathelement path="../../plugins/org.eclipse.tomcat_4.1.30.1/servlets-common.jar"/>
-				<pathelement path="../../plugins/org.eclipse.tomcat_4.1.30.1/servlets-default.jar"/>
-				<pathelement path="../../plugins/org.eclipse.tomcat_4.1.30.1/servlets-invoker.jar"/>
-				<pathelement path="../../plugins/org.eclipse.tomcat_4.1.30.1/servlets-manager.jar"/>
-				<pathelement path="../../plugins/org.eclipse.tomcat_4.1.30.1/tomcat-coyote.jar"/>
-				<pathelement path="../../plugins/org.eclipse.tomcat_4.1.30.1/tomcat-http11.jar"/>
-				<pathelement path="../../plugins/org.eclipse.tomcat_4.1.30.1/tomcat-util.jar"/>
-				<pathelement path="..\..\plugins\org.eclipse.help.appserver_3.1.0.jar"/>
-				<pathelement path="../org.eclipse.wst.ws.ui/bin/"/>
-				<pathelement path="../org.eclipse.wst.ws.ui/wsui.jar"/>
-				<pathelement path="../../plugins/org.eclipse.wst.internet.monitor.core_1.0.0/monitorcore.jar"/>
-				<pathelement path="../../plugins/org.eclipse.wst.internet.monitor.ui_1.0.0/monitorui.jar"/>
-			</classpath>
-			<src path="src/"			/>
-			</javac>
-		<!-- Copy necessary resources -->
-		<copy todir="${temp.folder}/wsiui.jar.bin" failonerror="true">
-			<fileset dir="src/" excludes="**/*.java, **/package.htm*"			/>
-		</copy>
-		<mkdir dir="${build.result.folder}"/>
-		<jar destfile="${build.result.folder}/wsiui.jar" basedir="${temp.folder}/wsiui.jar.bin"/>
-		<delete dir="${temp.folder}/wsiui.jar.bin"/>
-	</target>
-
-	<target name="wsiuisrc.zip" depends="init" unless="wsiuisrc.zip">
-		<mkdir dir="${build.result.folder}"/>
-		<zip destfile="${build.result.folder}/wsiuisrc.zip" filesonly="false" whenempty="skip" update="false">
-			<fileset dir="src/" includes="**/*.java"			/>
-		</zip>
-	</target>
-
-	<target name="build.jars" depends="init" description="Build all the jars for the plug-in: org.eclipse.wst.wsi.ui.">
-		<available property="wsiui.jar" file="${build.result.folder}/wsiui.jar"/>
-		<antcall target="wsiui.jar"/>
-	</target>
-
-	<target name="build.sources" depends="init">
-		<available property="wsiuisrc.zip" file="${build.result.folder}/wsiuisrc.zip"/>
-		<antcall target="wsiuisrc.zip"/>
-	</target>
-
-	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.wst.wsi.ui_1.0.0"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.wst.wsi.ui_1.0.0" failonerror="true">
-			<fileset dir="${build.result.folder}" includes="wsiui.jar"			/>
-		</copy>
-		<copy todir="${destination.temp.folder}/org.eclipse.wst.wsi.ui_1.0.0" failonerror="true">
-			<fileset dir="${basedir}" includes="wsiui.jar,plugin.properties,plugin.xml,icons/"			/>
-		</copy>
-	</target>
-
-	<target name="build.zips" depends="init">
-	</target>
-
-	<target name="gather.sources" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.wst.wsi.ui_1.0.0"/>
-		<copy file="${build.result.folder}/wsiuisrc.zip" todir="${destination.temp.folder}/org.eclipse.wst.wsi.ui_1.0.0" failonerror="false"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.wst.wsi.ui_1.0.0" failonerror="false">
-			<fileset dir="${basedir}" includes="icons/,plugin.properties,plugin.xml,src/,build.properties"			/>
-		</copy>
-	</target>
-
-	<target name="gather.logs" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.wst.wsi.ui_1.0.0"/>
-		<copy file="${temp.folder}/wsiui.jar.bin.log" todir="${destination.temp.folder}/org.eclipse.wst.wsi.ui_1.0.0" failonerror="false"/>
-	</target>
-
-	<target name="clean" depends="init" description="Clean the plug-in: org.eclipse.wst.wsi.ui of all the zips, jars and logs created.">
-		<delete file="${build.result.folder}/wsiui.jar"/>
-		<delete file="${build.result.folder}/wsiuisrc.zip"/>
-		<delete file="${plugin.destination}/org.eclipse.wst.wsi.ui_1.0.0.jar"/>
-		<delete file="${plugin.destination}/org.eclipse.wst.wsi.ui_1.0.0.zip"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-		<eclipse.convertPath fileSystemPath="d:/wtp/eclipse/workspace/org.eclipse.wst.wsi.ui" 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.">
-		<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_1.0.0.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-</project>
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 e204e1c..0000000
--- a/bundles/org.eclipse.wst.wsi.ui/plugin.properties
+++ /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
-#  *******************************************************************************/
-!-- 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_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 acb7f97..0000000
--- a/bundles/org.eclipse.wst.wsi.ui/plugin.xml
+++ /dev/null
@@ -1,92 +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
-   id="org.eclipse.wst.wsi.ui"
-   name="%_PLUGIN_NAME"
-   version="1.0.0"
-   provider-name="%_PROVIDER_NAME"
-   class="org.eclipse.wst.wsi.ui.internal.WSIUIPlugin">
-
-   <runtime>
-      <library name="wsiui.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-   <requires>
-      <import plugin="org.eclipse.jface.text"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.jface"/>
-      <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.ui.views"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor"/>
-      <import plugin="org.eclipse.ui.editors"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.debug.core"/>
-      <import plugin="org.eclipse.wst.common.ui"/>
-      <import plugin="org.eclipse.wst.validation"/>
-      <import plugin="org.eclipse.wst.xml.validation"/>
-      <import plugin="org.eclipse.wst.wsdl.validation"/>
-      <import plugin="org.eclipse.wst.wsi"/>
-      <import plugin="org.eclipse.wst.internet.monitor.core"/>
-      <import plugin="org.eclipse.wst.internet.monitor.ui"/>
-      <import plugin="org.eclipse.core.runtime.compatibility"/>
-      <import plugin="org.wsdl4j"/>
-   </requires>
-
-<!-- ======================================================= -->
-<!-- Purpose: Add validator action to TCPIP monitor.         -->
-<!-- Extension point: org.eclipse.ui.viewActions             -->
-<!-- ======================================================= -->
-<!--   <extension
-         point="org.eclipse.ui.viewActions">
-      <viewContribution
-            targetID="org.eclipse.wst.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"
-               enablesFor="*"
-               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="com.ibm.etools.validation.validator">
-      <validator>
-         <filter
-               objectClass="org.eclipse.core.resources.IFile"
-               caseSensitive="false"
-               nameFilter="*.wsimsg">
-         </filter>
-         <helper
-               class="com.ibm.etools.xml.tools.validation.Helper">
-         </helper>
-         <run
-               class=" com.ibm.etools.wsi.test.tools.validate.WSIMessageValidator">
-         </run>
-      </validator>
-   </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 f7ae943..0000000
--- a/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/LogBuilder.java
+++ /dev/null
@@ -1,381 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.internal.preferences.Base64;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.wst.internet.monitor.core.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.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;
-
-/**
- * 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 = "";
-
-  /**
-   * Properties of a RequestResponse.
-   */
-  private static final String PROPERTY_REQUEST_HEADER = "request-header";
-  private static final String PROPERTY_RESPONSE_HEADER = "response-header";
-  private static final String HTTP_REQUEST_BODY = "http-request-body";
-  private static final String HTTP_RESPONSE_BODY = "http-response-body";
-
-  /**
-   * 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)
-    {
-      byte[] request = rr.getRequest(Request.ALL);
-      byte[] response = rr.getResponse(Request.ALL);
-        
-      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);
-      String requestBody = null;
-      String responseBody = null;
-
-      if (unchunkedRequestBody != null)
-      {
-        requestBody = new String(Base64.encode(unchunkedRequestBody)); 
-      }
-
-      if (unchunkedResponseBody != null)
-      {
-        responseBody = new String(Base64.encode(unchunkedResponseBody)); 
-      }
-
-      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, requestBody, requestHeader);
-
-      MessageEntry messageEntryResponse = createMessageEntry(responseId, conversationId, 
-                MessageEntry.TYPE_RESPONSE, timestamp + rr.getResponseTime(), remoteHostAndPort,
-                localHostAndPort, responseBody, responseHeader);
-      try
-      {
-        if ((messageEntryRequest != null) && isMessageWithBrackets(requestBody))
-        {
-           if (messageEntryResponse != null)
-           {
-             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));
-  }
-      
-  /**
-   * 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, String messageContent, String header) 
-  {
- 	// Create log entry
-    MessageEntry messageEntry = new MessageEntryImpl();
-	messageEntry.setHTTPHeaders(header);
-	messageEntry.setMessage(messageContent);
-    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);
-            
-    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++;
-  }
-
-  /**
-   * 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().toOSString());
-      
-      // 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 af8135b..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().
-               toOSString().compareTo(((IFile)fExcludedFiles[j]).getLocation().toOSString()) == 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 206c9f6..0000000
--- a/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/WSIMessageValidator.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.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.eclispe.wst.validation.internal.core.ValidationException;
-//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#getReporter()
-   */
-  public IReporter getReporter()
-  {
-    if (reporter == null)
-    {
-      //reporter = new DefaultReporter(WSI_MESSAGE_VALIDATOR_ID);	
-    }	
-    return reporter;
-  }
-
-  /* (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 46bf5a5..0000000
--- a/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/WSIUIPlugin.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.ui.internal;
-
-import java.util.ResourceBundle;
-
-import org.eclipse.core.runtime.IPluginDescriptor;
-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;                
-
-//  /**
-//   * Message Logger associated with this plugin.
-//   */
-//  private static MsgLogger myMsgLogger;
-
-  /**
-   * 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;
-  }
-
-  /**
-   * 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 da5bfd5..0000000
--- a/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/actions/WSIValidateAction.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.ui.internal.actions;
-
-//import java.util.Iterator;
-//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.provisional.core.IValidator;
-import org.eclipse.wst.wsi.internal.analyzer.MessageAnalyzer;
-import org.eclipse.wst.wsi.internal.analyzer.WSIAnalyzerException;
-import org.eclipse.wst.wsi.ui.internal.WSIUIPlugin;
-import org.eclipse.wst.xml.validation.internal.core.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 static final String FILE_PROTOCOL = "file:";
-  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 wsdlfile 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 wsdlfile, String elementname, String namespace, String parentname, String type)
-  {
-  	this(f, showDialog);
-  	this.wsdlfile = 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 file)
-  {
-  	final MessageAnalyzer messageanalyzer;
-  	
-  	if(wsdlspecified)
-  	{
-  	  messageanalyzer = new MessageAnalyzer(FILE_PROTOCOL + file.getLocation().toOSString(), wsdlfile, elementname, namespace, parentname, type);	
-  	}
-  	else
-  	{	
-  	  messageanalyzer = new MessageAnalyzer(FILE_PROTOCOL + file.getLocation().toOSString());
-  	}
-  	
-  	IWorkspaceRunnable op = new IWorkspaceRunnable() 
-    {
-      public void run(IProgressMonitor progressMonitor) throws CoreException 
-      {        
-        clearMarkers(file);
-        try
-        {
-          messageanalyzer.validateConformance();
-        }
-        catch (WSIAnalyzerException ae)
-        {
-        	if (ae.getTargetException() instanceof SAXParseException)
-        	{
-        	  exceptionCaught = true;
-//        	  createMarker(file, ae, ERROR_MARKER);
-        	}
-        }
-        catch (Exception e)
-        {
-        }
-//        createMarkers(file, messageanalyzer.getAssertionWarnings(), WARNING_MARKER);
-//        createMarkers(file, messageanalyzer.getAssertionErrors(), ERROR_MARKER);
-//
-		}
-    };
-   
-    
-     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 marker for the specified resource with the given severity.
-   * @param resource the resource that 
-   * @param ae the WS-I Analyzer exception
-   * @param error_marker flag indicating severity of problem
-   */
-//  protected void createMarker(IResource resource, WSIAnalyzerException ae, int error_marker) 
-//  {
-// 	Throwable throwable = ae.getTargetException();
-//
-//	if (throwable instanceof SAXParseException)
-//	{
-//		int n = ((SAXParseException)throwable).getLineNumber();
-//		int c = ((SAXParseException)throwable).getColumnNumber();
-//		
-//		getOrCreateReporter().addErrorMessage(resource, ((SAXParseException)throwable).getMessage(), n, c);
-//	}
-//	else
-//	{
-//		getOrCreateReporter().addErrorMessage(resource, ae.getMessage(), 0, 0);
-//	}
-//  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.validate.ValidateAction#createMarkers(org.eclipse.core.resources.IResource, java.util.List, int)
-   */
-//  public void createMarkers(IResource resource, List list, int marker)
-//  { 
-//    for (Iterator i = list.iterator(); i.hasNext(); )
-//    {
-//      AssertionError assertionError = (AssertionError) i.next();
-//
-//      int n = assertionError.getLine();
-//      int c = assertionError.getColumn();
-//      
-//      if(marker == WARNING_MARKER)
-//      {
-//        getOrCreateReporter().addWarningMessage(resource, assertionError.getErrorMessage(), n, c);
-//      }
-//      else if (marker == ERROR_MARKER)
-//      {
-//        getOrCreateReporter().addErrorMessage(resource, assertionError.getErrorMessage(), n, c);
-//      }
-//    }
-//  }
-  
-  /**
-   * Clear all the markers on the given resource generated by this validator.
-   * 
-   * @param resource The resource with the markers to clear.
-   */
-//  public void clearMarkers(IResource resource)
-//  {
-//    getOrCreateReporter().removeAllMessages(resource);
-//  }
-
- /**
-  * If a reporter doesn't exist creates it or uses the reporter already created.
-  * 
-  * @return The reporter.
-  */
-//  protected IReporter getOrCreateReporter()
-//  {
-//    if (reporter == null)
-//    {
-//      reporter = ReporterRegister.getInstance().getReporter(WSIMessageValidator.WSI_MESSAGE_VALIDATOR_ID);
-//    }
-//    return reporter;
-//  }
-
- /**
-  * Gets the validator.
-  * 
-  * @return Returns a IValidator.
-  */
-  public IValidator getValidator()
-  {
-    return validator;
-  }
-
- /**
-  * Sets the validator.
-  * 
-  * @param validator The validator to set.
-  */
-  public void setValidator(IValidator validator)
-  {
-    this.validator = validator;
-  }
-}
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 8626c12..0000000
--- a/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/actions/actionDelegates/ValidateWSIProfileActionDelegate.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.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.viewers.ISelection;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.wst.internet.monitor.core.Request;
-import org.eclipse.wst.wsi.ui.internal.LogBuilder;
-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
-    {
-      ValidationWizard validateWizard = new ValidationWizard(DEFAULT_LOG_FILENAME);
-
-      //TODO requestResponses = MonitorCore.getRequests();
-      List wsdllocs = new Vector();
-      if(requestResponses != null)
-      {
-       	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()]));
-      Shell shell = Display.getCurrent().getActiveShell();
-      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();
-        //String filename = file.getLocation().toOSString();
-        //IMonitor monitor = MonitorCore.getRequests();
-        //monitor.getElements();
-        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);
-        }
-        //WSIValidateAction validateAction = new WSIValidateAction(file, true);
-//        validateAction.setValidator(messageValidator);
-        //validateAction.run();
-//        WSIValidator wsiValidator = new WSIValidator();
-//        wsiValidator.validate(file);
-      }
-    }
-    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/dialogs/SelectSingleFileDialog.java b/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/dialogs/SelectSingleFileDialog.java
deleted file mode 100644
index 2b87112..0000000
--- a/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/dialogs/SelectSingleFileDialog.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.ui.internal.dialogs;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.TitleAreaDialog;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-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.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.internal.IWorkbenchGraphicConstants;
-import org.eclipse.ui.internal.WorkbenchImages;
-
-import org.eclipse.wst.common.ui.viewers.SelectSingleFileView;
-import  org.eclipse.wst.wsi.ui.internal.WSIUIPlugin;
-
-
-public class SelectSingleFileDialog extends TitleAreaDialog
-{            
-  protected SelectSingleFileView selectSingleFileView; 
-  protected Button okButton;
- 
-  public SelectSingleFileDialog(Shell parentShell, IStructuredSelection selection, boolean isFileMandatory) 
-  {
-    super(parentShell);                      
-    if (selection == null)
-    {
-      selection = new StructuredSelection();
-    }
-    selectSingleFileView = new SelectSingleFileView(selection, isFileMandatory)
-    {
-	  public void createFilterControl(Composite composite)
-	  {
-		SelectSingleFileDialog.this.createFilterControl(composite);
-	  }
-    };  
-  }
-
-  protected Control createDialogArea(Composite parent) 
-  {                                                 
-    Composite dialogArea = (Composite)super.createDialogArea(parent);
-    
-    Composite composite = new Composite(dialogArea, SWT.NONE);
-    composite.setLayout(new GridLayout());
-    GridData gd = new GridData(GridData.FILL_BOTH);
-    gd.widthHint = 350;
-    gd.heightHint = 350;
-    composite.setLayoutData(gd);   
-            
-    SelectSingleFileView.Listener listener = new SelectSingleFileView.Listener()
-    {                                             
-      public void setControlComplete(boolean isComplete)
-      {                            
-        okButton.setEnabled(isComplete);
-      }
-    };
-    selectSingleFileView.setListener(listener);
-    selectSingleFileView.createControl(composite);
-    return dialogArea;
-  }  
-
-  protected void createButtonsForButtonBar(Composite parent) 
-  {
-    okButton = createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true);
-    okButton.setEnabled(false);
-    createButton(parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false);
-  }  
-       
-  public void create()
-  {
-    super.create();
-    selectSingleFileView.setVisibleHelper(true);
-    getShell().setText(WSIUIPlugin.getResourceString("_UI_DIALOG_SS_FILE_SHELL_TEXT"));
-    setTitle(WSIUIPlugin.getResourceString("_UI_DIALOG_SS_FILE_TITLE"));
-    setMessage(WSIUIPlugin.getResourceString("_UI_DIALOG_SS_FILE_DESCRIPTION"));
-    setTitleImage(WorkbenchImages.getImageDescriptor(IWorkbenchGraphicConstants.IMG_DLGBAN_SAVEAS_DLG).createImage());
-  }
-
-  public void createFilterCombo(Composite composite)
-  {
-  } 
-
-  public IFile getFile()
-  {  
-    return selectSingleFileView.getFile();
-  }   
-
-  public void addFilterExtensions(String[] filterExtensions)
-  { 
-    selectSingleFileView.addFilterExtensions(filterExtensions);
-  }
-  
-  public void createFilterControl(Composite composite)
-  { 
-  }
-}
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 be3f395..0000000
--- a/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/wizards/ValidationWizard.java
+++ /dev/null
@@ -1,319 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.Definition;
-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();
-          Definition defElem = 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 c7468e2..0000000
--- a/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/wizards/ValidationWizardWSDLPage.java
+++ /dev/null
@@ -1,365 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.wsi.ui.internal.WSIUIPlugin;
-import org.eclipse.wst.wsi.ui.internal.dialogs.SelectSingleFileDialog;
-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" });
-      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 dd67dfa..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.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<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 ba077a4..0000000
--- a/bundles/org.eclipse.wst.wsi/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
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/build.properties b/bundles/org.eclipse.wst.wsi/build.properties
deleted file mode 100644
index 41b6fac..0000000
--- a/bundles/org.eclipse.wst.wsi/build.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-source.wsicore.jar = wsicore/
-bin.includes = wsicore.jar,\
-               wsivalidate.jar,\
-               plugin.xml,\
-               plugin.properties
-jars.compile.order = wsicore.jar,\
-                     wsivalidate.jar
-source.wsivalidate.jar = wsivalidate/
-output.wsicore.jar = bin/
-output.wsivalidate.jar = bin/
-src.includes = plugin.xml,\
-               plugin.properties
diff --git a/bundles/org.eclipse.wst.wsi/component.xml b/bundles/org.eclipse.wst.wsi/component.xml
deleted file mode 100644
index 7ca13a9..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"><component-depends unrestricted="false"></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 5ba8a1f..0000000
--- a/bundles/org.eclipse.wst.wsi/plugin.xml
+++ /dev/null
@@ -1,60 +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
-   id="org.eclipse.wst.wsi"
-   name="%_PLUGIN_NAME"
-   version="1.0.0"
-   provider-name = "%_PROVIDER_NAME"
-   class="org.eclipse.wst.wsi.internal.WSITestToolsPlugin">
-
-   <runtime>
-      <library name="wsicore.jar">
-         <export name="*"/>
-      </library>
-      <library name="wsivalidate.jar">
-         <export name="*"/>
-      </library>
-    </runtime>
-   
-   <requires>
-      <import plugin="org.eclipse.core.runtime.compatibility"/>
-      <import plugin="org.eclipse.wst.command.env"/>
-      <import plugin="org.eclipse.wst.command.env.ui"/>
-      <import plugin="org.eclipse.wst.command.env.core"/>
-      <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.ui.views"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor"/>
-      <import plugin="org.eclipse.ui.editors"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.wst.wsdl.validation"/>
-      <import plugin="org.eclipse.wst.ws.ui"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.apache.axis11"/>
-      <import plugin="org.uddi4j"/>
-      <import plugin="org.wsdl4j"/>
-   </requires>
-  
-     <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 fc57a4e..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/ToolInfo.java
+++ /dev/null
@@ -1,465 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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;
-  }
-
-  /**
-   * Format tool location.
-   * @param location  tool location.
-   * @return formatted tool location.
-   */
-  private String formatToolLocation(String location)
-  {
-    // Start with specified location
-    String returnLocation = location;
-
-    // Make sure string ends the "/"
-    if (!returnLocation.endsWith("/"))
-      returnLocation += "/";
-
-    // Add tool name and .html
-    return returnLocation + getName() + ".html";
-  }
-
-  /**
-   * 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 7807511..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/WSIConstants.java
+++ /dev/null
@@ -1,485 +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 = "../common/profiles/SSBP10_BP11_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";
-
-}
\ 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 2393413..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/WSIException.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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
-{
-  /**
-   * 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 77e2394..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/WSIFileNotFoundException.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;
-
-/**
- * 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
-{
-
-  /**
-   * 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 2c80e36..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/WSIRuntimeException.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;
-
-/**
- * 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
-{
-
-  /**
-   * 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 c4638a1..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 org.eclipse.wst.wsi.internal.core.xml.XMLTags;
-
-import javax.xml.namespace.QName;
-
-/**
- * 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 4d5e46c..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 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;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.List;
-import java.util.Vector;
-
-/**
- * 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 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 = 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 0321f89..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/AnalyzerContext.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.analyzer;
-
-import org.eclipse.wst.wsi.internal.core.xml.XMLDocumentCache;
-
-/**
- * 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;
-  protected XMLDocumentCache documentList = new XMLDocumentCache();
-
-  /**
-   * 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;
-  }
-
-  /**
-   * Get the list of cached documents.
-   * @return the list of cached documents.
-   * @see #setDocumentList
-   */
-  public XMLDocumentCache getDocumentList()
-  {
-    return documentList;
-  }
-
-  /**
-   * Set the list of cached documents.
-   * @param documentList a list of cached documents.
-   * @see #getDocumentList
-   */
-  public void setDocumentList(XMLDocumentCache documentList)
-  {
-    this.documentList = documentList;
-  }
-
-  /**
-   * Add a document to the list of cached documents.
-   * @param key a key to associate with the given document.
-   * @param document a document to be identified with the given key.
-   */
-  public void addDocument(Object key, Object document)
-  {
-    this.documentList.put(key, document);
-  }
-
-}
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 83794f5..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/BasicProfileAnalyzer.java
+++ /dev/null
@@ -1,655 +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.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));
-  }
-
-  /**
-   * 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);
-  }
-
-  /**
-   * 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));
-  }
-
-  /**
-   * 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));
-
-    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 wsdlDocument)
-    throws WSIException
-  {
-    WSDLDocument returnWSDLDocument = null;
-
-    // Init WSDLValidator
-    wsdlValidator.init(
-      this.analyzerContext,
-      this.profileAssertions.getArtifact(ArtifactType.TYPE_DESCRIPTION),
-      reportArtifact,
-      wsdlURI,
-      wsdlDocument,
-      this.reporter);
-
-    // If a WSDL URI was specified or located in a UDDI registry, then process the WSDL tests
-    if (wsdlURI != null || wsdlDocument != 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 wsdlDocument)
-    throws WSIException
-  {
-    //Log log = null;
-    //MessageEntry logEntry = null;
-
-    // Init MessageValidator
-    messageValidator.init(
-      this.analyzerContext,
-      this.profileAssertions.getArtifact(ArtifactType.TYPE_MESSAGE),
-      reportArtifact,
-      wsdlDocument,
-      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 wsdlDocument)
-    throws WSIException
-  {
-    // Init envelopeValidator
-    envelopeValidator.init(
-      this.analyzerContext,
-      this.profileAssertions.getArtifact(ArtifactType.TYPE_ENVELOPE),
-      reportArtifact,
-      wsdlDocument,
-      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;
-
-      boolean printStackTrace = true;
-      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 06e82b6..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/CandidateInfo.java
+++ /dev/null
@@ -1,921 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.BindingOperation;
-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
-
-        BindingOperation bindingOperation;
-
-        // 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 8f35c34..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/EnvironmentInfo.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.analyzer;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.util.XMLInfo;
-
-import java.io.*;
-
-/**
- * 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 d920115..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 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;
-
-import java.io.Reader;
-
-
-/**
- * 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 f549cb2..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 org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.document.DocumentElement;
-
-import javax.xml.namespace.QName;
-
-/**
- * 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 ad0870f..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 org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.document.DocumentElement;
-
-import javax.xml.namespace.QName;
-
-/**
- * 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 2bf3dcc..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 org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.document.DocumentElement;
-
-import javax.xml.namespace.QName;
-
-/**
- * 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 531cead..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 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;
-
-import java.io.File;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
-/**
- * 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 ab943a4..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/AnalyzerConfigReaderImpl.java
+++ /dev/null
@@ -1,570 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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);
-  }
-
-  /**
-   * 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 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 86129fa..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/AssertionResultsOptionImpl.java
+++ /dev/null
@@ -1,199 +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 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;
-
-import java.io.*;
-
-/**
- * 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 b983011..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/WSDLElementImpl.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.analyzer.config.impl;
-
-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;
-
-import javax.xml.namespace.QName;
-
-import java.io.*;
-
-/**
- * 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 63ac41f..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/WSDLReferenceImpl.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.analyzer.config.impl;
-
-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;
-
-import java.io.*;
-
-/**
- * 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 5479fda..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/common/impl/AddStyleSheetImpl.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.common.impl;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.common.AddStyleSheet;
-
-import java.io.*;
-import java.util.TreeMap;
-
-/**
- * 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 19c3908..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 org.eclipse.wst.wsi.internal.core.WSIException;
-import org.w3c.dom.Document;
-
-import java.io.IOException;
-import java.io.Reader;
-import java.io.Writer;
-
-/**
- * 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 d324d8f..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/document/impl/DocumentFactoryImpl.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.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;
-import org.eclipse.wst.wsi.internal.core.util.WSIProperties;
-
-/**
- * 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 9559e21..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/document/impl/DocumentWriterImpl.java
+++ /dev/null
@@ -1,125 +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 org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.document.DocumentWriter;
-import org.w3c.dom.Document;
-
-import java.io.*;
-
-/**
- * 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 64eb9dc..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 org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.document.WSIDocument;
-
-import javax.xml.namespace.QName;
-
-import java.util.*;
-
-/**
- * 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 f1b71ff..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 org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.document.DocumentReader;
-
-import java.io.*;
-
-/**
- * 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 36ee6f3..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/LogWriter.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.log;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.document.DocumentWriter;
-import org.eclipse.wst.wsi.internal.core.log.Log;
-
-import java.io.Writer;
-
-/**
- * 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 d67687a..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.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;
-
-import java.io.*;
-
-/**
- * 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 8fb7efe..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/impl/LogReaderImpl.java
+++ /dev/null
@@ -1,782 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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 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.log.impl.MimePartImpl;
-import org.eclipse.wst.wsi.internal.core.log.impl.MimePartsImpl;
-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.*;
-import org.xml.sax.helpers.*;
-
-import java.io.*;
-import java.util.*;
-
-/**
- * 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 e9ce326..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 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;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.Collection;
-import java.util.Iterator;
-
-/**
- * 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 b3b8ae5..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/ChunkedData.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.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;
-    int index;
-
-    // Look for [CRLF][0][CRLF] in the chunked data      
-    if ((index =
-      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 4754756..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 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;
-
-import java.io.*;
-import java.util.*;
-
-/**
- * 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 f497624..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/Monitor.java
+++ /dev/null
@@ -1,501 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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 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.*;
-import org.eclipse.wst.wsi.internal.core.util.MessageList;
-import org.eclipse.wst.wsi.internal.core.util.TestUtils;
-
-import java.io.*;
-import java.util.Iterator;
-import java.util.Vector;
-
-/**
- * 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
-    {
-      String configFileName;
-      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()
-    {
-      String line = null;
-
-      // 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 36d3760..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 org.eclipse.wst.wsi.internal.core.monitor.config.Redirect;
-
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.util.Iterator;
-import java.util.Vector;
-
-/**
- * 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 66b7b9d..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/SocketConnection.java
+++ /dev/null
@@ -1,305 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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 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;
-
-import java.net.Socket;
-import java.util.*; // SS
-
-/**
- * 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 2a3485c..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/SocketHandler.java
+++ /dev/null
@@ -1,966 +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 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;
-
-import java.net.Socket;
-
-import java.io.InputStream;
-import java.io.InterruptedIOException;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
-
-/**
- * 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
-  {
-    MessageEntry messageEntry = null;
-
-    // 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 11ad709..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 org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.document.DocumentElement;
-
-import javax.xml.namespace.QName;
-
-/**
- * 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 26f0d55..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 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;
-
-import javax.xml.namespace.QName;
-
-/**
- * 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 526f1a2..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 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;
-
-import java.io.Reader;
-
-/**
- * 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 fbf00d0..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/impl/MonitorConfigImpl.java
+++ /dev/null
@@ -1,556 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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 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.*;
-import org.eclipse.wst.wsi.internal.core.util.MessageList;
-
-import java.io.*;
-
-/**
- * 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 83abcca..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/impl/MonitorConfigReaderImpl.java
+++ /dev/null
@@ -1,474 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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 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.*;
-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;
-
-import java.io.*;
-
-/**
- * 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 8ddaa0e..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/impl/RedirectImpl.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.monitor.config.impl;
-
-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;
-
-import java.io.*;
-import java.net.*;
-
-/**
- *  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 d4a0b76..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/ProfileArtifact.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;
-
-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;
-
-import javax.xml.namespace.QName;
-
-import java.util.*;
-
-/**
- * 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 1e6231d..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 org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.document.WSIDocument;
-
-import javax.xml.namespace.QName;
-
-import java.util.TreeMap;
-import java.util.Vector;
-
-/**
- * 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 f0fe871..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/ProfileAssertionsReader.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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.WSIException;
-import org.eclipse.wst.wsi.internal.core.document.DocumentReader;
-import org.eclipse.wst.wsi.internal.core.profile.ProfileAssertions;
-
-import java.io.Reader;
-
-/**
- * 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 0a1b8f6..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.*;
-
-/**
- * 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 bbc3c40..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 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;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.LinkedList;
-import java.util.TreeMap;
-import java.util.Vector;
-
-/**
- * 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 c4d8428..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/impl/ProfileAssertionsImpl.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.impl;
-
-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;
-
-import java.util.Iterator;
-import java.util.TreeMap;
-
-/**
- * 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 8091806..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/impl/ProfileAssertionsReaderImpl.java
+++ /dev/null
@@ -1,515 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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 String id;
-    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 Vector prereqIdList = new Vector();
-    private TreeMap assertions = new TreeMap();
-    private String currentElement = null;
-    private TestAssertion testAssertion = null;
-    private StringBuffer logInput = null;
-    private StringBuffer wsdlInput = null;
-    private StringBuffer uddiInput = 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
-          testAssertion.setId(atts.getValue("", WSIConstants.ATTR_ID));
-          testAssertion.setType(atts.getValue("", WSIConstants.ATTR_TYPE));
-          testAssertion.setEntryTypeName(
-            atts.getValue("", WSIConstants.ATTR_ENTRY_TYPE));
-          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);
-      }
-      */
-    }
-  }
-}
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 c064f23..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 org.eclipse.wst.wsi.internal.core.profile.EntryTypeList;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-
-import java.util.Vector;
-
-/**
- * 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 e661c10..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/BaseValidator.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;
-
-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 34ce83d..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/EntryContext.java
+++ /dev/null
@@ -1,223 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available 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 487b0a8..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/AssertionProcessVisitor.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;
-
-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
-{
-  private final BaseValidatorImpl base_validator;
-
-  /**
-   * @param BaseValidatorImpl
-   */
-  public AssertionProcessVisitor(BaseValidatorImpl impl)
-  {
-    super(impl);
-    this.base_validator = 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 11de6a7..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/BaseMessageValidator.java
+++ /dev/null
@@ -1,1839 +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.BaseValidatorImpl;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl.*;
-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) + ":"))
-        {
-          String nodeValue = node.getNodeValue();
-          child.setAttribute(node.getNodeName(), 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 f378e88..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/BaseValidatorImpl.java
+++ /dev/null
@@ -1,714 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * 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;
-
-    // Make sure that the XML document cache is updated in the analyzer context
-    this.documentList = this.analyzerContext.getDocumentList();
-
-    // 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);
-
-                // Make sure that the XML document cache is updated in the analyzer context
-                this.analyzerContext.setDocumentList(documentList);
-
-                //  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();
-
-    // Set cached document list in case it was updated
-    this.analyzerContext.setDocumentList(this.documentList);
-  }
-
-  /**
-   * 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 44f1e25..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1009.java
+++ /dev/null
@@ -1,315 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * 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();
-      }
-      Element soapBodyElem = (Element) soapBodyList.item(0);
-
-      // 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 8e07a79..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
-        {
-          boolean isSchemaValid = 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 76b9453..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1701.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.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"
-        Document validationDoc =
-          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 dc501f4..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1925.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 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.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 23235e9..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/UDDIValidatorImpl.java
+++ /dev/null
@@ -1,594 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * 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.*;
-
-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;
-
-  /**
-   * WSDL binding.
-   */
-  private Binding binding = null;
-
-  /* (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
-        binding = 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 49f3ef6..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/WSI3007.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.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
-  {
-    String serviceLocation = null;
-
-    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 0aec151..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2904.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.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
-{
-  private final WSDLValidatorImpl validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public AP2904(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 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 cce15cd..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2011.java
+++ /dev/null
@@ -1,343 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * 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))
-        {
-          Attr a = XMLUtils.getAttribute(im, ATTR_XSD_NAMESPACE);
-          String namespace = (a != null) ? a.getValue() : "";
-          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 ccd0c11..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2018.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * 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.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.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;
-  }
-
-  /*
-   * Create failed report.
-  * @param el - xml element
-  * @param entryContext - Entry context
-  */
-  private void createFailed(
-    String message,
-    Element el,
-    EntryContext entryContext)
-  {
-    QName context =
-      (el != null)
-        ? new QName(el.getNamespaceURI(), el.getLocalName())
-        : new QName("definition");
-    result = AssertionResult.RESULT_FAILED;
-    failureDetail = this.validator.createFailureDetail(message, entryContext);
-  }
-
-  /**
-   * 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 (isExtensibilityElement(el) && el != null)
-          if (el != null)
-            el = XMLUtils.findPreviousSibling(el);
-
-        boolean documentIsPresent =
-          (XMLUtils.findChildElement((Element) root, WSDL_DOCUMENTATION)
-            != null);
-        boolean importIsPresent =
-          (XMLUtils.findChildElement((Element) root, WSDL_IMPORT) != null);
-
-        if (importIsPresent)
-          if (!XMLUtils.equals(el, WSDL_IMPORT))
-          {
-            createFailed(
-              "Types element can not follow import element.",
-              el,
-              entryContext);
-            return validator.createAssertionResult(
-              testAssertion,
-              result,
-              failureDetail);
-          }
-          else
-            el = XMLUtils.findPreviousSibling(el);
-
-        while (isExtensibilityElement(el) && el != null)
-          if (el != null)
-            el = XMLUtils.findPreviousSibling(el);
-
-        if (documentIsPresent)
-          if (!XMLUtils.equals(el, WSDL_DOCUMENTATION))
-          {
-            createFailed(
-              "Types element must follow only a documentation element.",
-              el,
-              entryContext);
-            return validator.createAssertionResult(
-              testAssertion,
-              result,
-              failureDetail);
-          }
-          else
-            el = XMLUtils.findPreviousSibling(el);
-
-        if (!importIsPresent && !documentIsPresent && el != null)
-          createFailed(
-            "Types element must follow only a documentation element.",
-            el,
-            entryContext);
-
-        if (importIsPresent
-          && documentIsPresent
-          && el != null
-          && !XMLUtils.equals(el, WSDL_DEFINITIONS)
-          && el.getNamespaceURI().equals(WSIConstants.NS_URI_WSDL))
-          createFailed(
-            "Types element must not follow the "
-              + el.getTagName()
-              + " element.",
-            el,
-            entryContext);
-      }
-    }
-
-    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 21a07e3..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2019.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.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("");
-    String soapExtensibleWithNamespace = null;
-
-    // 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 d39ac89..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2101.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.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;
-import org.w3c.dom.Document;
-
-
-/**
- * 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
-        Document doc =
-          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 01c5ece..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2107.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.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.Document;
-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 c69a3b5..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2112.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.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();
-  private Message message = null;
-
-  /* 
-   * 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 7ee1ed0..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2122.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.profile.validator.impl.wsdl;
-
-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;
-
-
-/**
- * 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;
-  }
-
-  private String context;
-
-  /**
-   * @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();
-
-    Definition definition = null;
-
-    if (types != null)
-    {
-      if ((definition =
-        validator.analyzerContext.getCandidateInfo().getDefinition(types))
-        == null)
-      {
-        throw new WSIException("Could not find types definition in any WSDL document.");
-      }
-
-      context = definition.getDocumentBaseURI();
-
-      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 83d886c..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2202.java
+++ /dev/null
@@ -1,423 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * 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";
-  private final String VERSION_TOKEN = "version";
-
-  /* (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))
-        {
-          Attr a = XMLUtils.getAttribute(im, ATTR_XSD_NAMESPACE);
-          String namespace = (a != null) ? a.getValue() : "";
-          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 5d7cbbd..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP4202.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.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.XMLDocumentCache;
-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(), 
-           validator.getDocumentList());
-     
-     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,
-       XMLDocumentCache documentList)
-     {
-       super(context, documentList, 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 7b3a848..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSDLValidatorImpl.java
+++ /dev/null
@@ -1,2319 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * 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;
-    Entry entry = 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, documentList);
-  }
-
-  /**
-   * 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(),
-              documentList);
-
-          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 28dd51b..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 org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.document.DocumentElement;
-
-import javax.xml.namespace.QName;
-
-/**
- * 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 9bdcf0a..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 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;
-
-import javax.xml.namespace.QName;
-
-/**
- * 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 a493d51..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 org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.document.DocumentElement;
-
-import javax.xml.namespace.QName;
-
-/**
- * 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 0b4fc14..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/ArtifactReferenceImpl.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.report.impl;
-
-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;
-
-import java.io.*;
-
-/**
- * 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 15ea545..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 org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.report.EntryResult;
-
-import java.util.TreeMap;
-
-/**
- * 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 71d070b..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/FailureDetailImpl.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.report.impl;
-
-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;
-
-import java.io.*;
-
-/**
- * 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 5d3e19a..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/PrereqFailedListImpl.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.report.impl;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.report.PrereqFailedList;
-
-import java.io.*;
-import java.util.*;
-
-/**
- * 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 c9a049d..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
-    PrintWriter printWriter = 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 6751d3a..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.1
-wsi.tool.release.date=2004-11-30
-wsi.tool.implementer=Eclipse.org Organization
-wsi.tool.location=http://www.eclipse.org/wsvt
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 f639549..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/BasicRules.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.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) == '(')
-      {
-        int idxNew = 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;
-    int newIndex = 0;
-
-    // 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 ceb487c..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/HttpHeadersValidator.java
+++ /dev/null
@@ -1,1739 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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_MD5 = "Content-MD5";
-  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
-    {
-      URL url = 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)
-  {
-    URL url;
-
-    try
-    {
-      url = new URL(value);
-    }
-    catch (MalformedURLException e)
-    {
-      try
-      {
-        url = 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 isText.
-   * @param text
-   * @return boolean
-   */
-  private static boolean isText(String text)
-  {
-    char[] chs = text.toCharArray();
-    for (int i = 0; i < chs.length; i++)
-    {
-      if (chs[i] == '\"')
-        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 1c40e2c..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/OperationSignature.java
+++ /dev/null
@@ -1,772 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.BindingOperation;
-import javax.wsdl.Message;
-import javax.wsdl.*;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.soap.*;
-import javax.wsdl.extensions.soap.SOAPBody;
-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 f6714e7..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/SetCookie2Validator.java
+++ /dev/null
@@ -1,649 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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 comment = false;
-  private boolean commentURL = false;
-  private boolean domain = false;
-  private boolean max_age = false;
-  private boolean path = false;
-  private boolean port = false;
-  private boolean version = false;
-
-  /**
-   * Method resetFlags.
-   */
-  private void resetFlags()
-  {
-    comment = false;
-    commentURL = false;
-    domain = false;
-    max_age = false;
-    path = false;
-    port = false;
-    version = 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)
-  {
-
-    resetFlags();
-
-    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;
-
-    String token = str.substring(index, BasicRules.getLastToken(str, index));
-
-    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 <-
-      comment = true;
-      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
-      {
-        URL url = 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++;
-      commentURL = true;
-      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 <-
-      domain = true;
-      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 <-
-      max_age = true;
-      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();
-      port = true;
-      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 <-
-      version = true;
-      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 9dc70d7..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/StringTokenizer.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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;
-    private String next;
-
-    /**
-     * 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 9e41a06..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 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;
-
-import java.io.*;
-
-/**
- * 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 schemaLocation;
-  }
-}
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 01a389e..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/TypesRegistry.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.util;
-
-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.*;
-import javax.wsdl.Import;
-import javax.wsdl.Types;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.UnknownExtensibilityElement;
-import javax.wsdl.extensions.soap.*;
-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
-{
-  /* (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);
-        else
-          // if xsd:import element is found -> load schema and process schema
-          if (XMLUtils.equals(n, ELEM_XSD_IMPORT))
-            loadSchema(n, context);
-          // if xsd:include element is found -> load schema and process schema
-          else if (XMLUtils.equals(n, ELEM_XSD_INCLUDE))
-            loadSchema(n, context);
-          else
-            // else iterate element recursively
-            searchForSchema(n.getFirstChild(), 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
-      {
-        // if any error or root element is not XSD schema -> error
-        Document schema =
-          baseValidator.parseXMLDocumentURL(
-            schemaLocation.getValue(),
-            context,
-            null);
-        if (XMLUtils.equals(schema.getDocumentElement(), ELEM_XSD_SCHEMA))
-          processSchema(
-            schema.getDocumentElement(),
-            XMLUtils.createURLString(schemaLocation.getValue(), context));
-      }
-      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 b022558..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/Utils.java
+++ /dev/null
@@ -1,1418 +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.TimeZone;
-import java.util.Vector;
-import java.util.StringTokenizer;
-
-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;
-	    int end = message.length;
-	    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
-      InputStream is = 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);
-  	  String content = Utils.getContent(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 9b57716..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/WSIProperties.java
+++ /dev/null
@@ -1,344 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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 org.uddi4j.transport.TransportFactory;
-
-import java.util.*;
-
-/**
- * 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 = "common/schemas/wsdl11.xsd";
-
-  /**
-   * 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 =
-    "common/schemas/wsdlsoap.xsd";
-
-  /**
-   * 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 =
-    "common/schemas/wsdlMime.xsd";
-
-  /**
-   * 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 =
-    "common/schemas/soapEnvelope.xsd";
-
-  /**
-   * 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 = "common/schemas/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 583e2e6..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=common/schemas/XMLSchema.xsd
-wsi.analyzer.soap.schema=common/schemas/soapEnvelope.xsd
-wsi.analyzer.wsdl.schema=common/schemas/wsdl11.xsd
-wsi.analyzer.wsdlsoap.schema=common/schemas/wsdlSoap.xsd
-wsi.analyzer.wsdlmime.schema=common/schemas/wsdlMime.xsd
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 8845278..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/WSDLDocument.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.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;
-
-/**
- * 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
-      this.definitions = wsdlReader.readWSDL(null, fileName);
-
-      // 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 (ClassCastException 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 9abed49..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/WSDLElementList.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.wsdl;
-
-import org.eclipse.wst.wsi.internal.core.xml.dom.ElementLocation;
-
-import java.util.*;
-
-/**
- * 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 67bc1fe..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/WSDLReaderImpl.java
+++ /dev/null
@@ -1,766 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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 org.apache.xerces.dom.ElementImpl;
-import org.eclipse.wst.wsi.internal.core.xml.dom.ElementLocation;
-
-import com.ibm.wsdl.*;
-import com.ibm.wsdl.util.StringUtils;
-import com.ibm.wsdl.util.xml.*;
-
-import org.w3c.dom.*;
-import org.xml.sax.*;
-
-import javax.wsdl.*;
-import javax.wsdl.extensions.*;
-import javax.wsdl.factory.*;
-import javax.xml.namespace.*;
-import javax.xml.parsers.*;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.*;
-
-/**
- * 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 =
-      super.parseDefinitions(documentBaseURI, defEl, importedDefs);
-
-    // Try to add element to list
-    addElementToList(defEl, def);
-
-    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 prefix = (index != -1) ? prefixedValue.substring(0, index) : null;
-      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(ElementLocation.KEY_NAME);
-
-      // 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 2699390..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/WSDLUtils.java
+++ /dev/null
@@ -1,383 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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 org.eclipse.wst.wsi.internal.core.WSIConstants;
-
-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 java.util.*;
-
-/**
- * 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();
-    ExtensibilityElement extElement;
-    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 635dd92..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/traversal/VisitorAdaptor.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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[] nullClass = new Class[] {
-  };
-  static final private Object[] nullObject = new Object[] {
-  };
-  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 b0a3797..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/traversal/WSDLTraversal.java
+++ /dev/null
@@ -1,3270 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.Part;
-import javax.wsdl.Service;
-import javax.wsdl.Types;
-import javax.wsdl.Operation;
-import javax.wsdl.Input;
-import javax.wsdl.Output;
-import javax.wsdl.Fault;
-import javax.wsdl.Binding;
-import javax.wsdl.BindingOperation;
-import javax.wsdl.BindingInput;
-import javax.wsdl.BindingOutput;
-import javax.wsdl.BindingFault;
-import javax.wsdl.Import;
-import org.w3c.dom.Element;
-import javax.wsdl.Message;
-import javax.wsdl.Port;
-import javax.wsdl.PortType;
-import javax.wsdl.Definition;
-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 java.util.Iterator;
-import java.util.Map;
-import java.util.Vector;
-
-/**
- * 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 aed01c0..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/traversal/WSDLTraversalContext.java
+++ /dev/null
@@ -1,1125 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.Part;
-import javax.wsdl.Service;
-import javax.wsdl.Types;
-import javax.wsdl.Operation;
-import javax.wsdl.Input;
-import javax.wsdl.Output;
-import javax.wsdl.Fault;
-import javax.wsdl.Binding;
-import javax.wsdl.BindingOperation;
-import javax.wsdl.BindingInput;
-import javax.wsdl.BindingOutput;
-import javax.wsdl.BindingFault;
-import javax.wsdl.Import;
-import org.w3c.dom.Element;
-import javax.wsdl.Message;
-import javax.wsdl.Port;
-import javax.wsdl.PortType;
-import javax.wsdl.Definition;
-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.SOAPFault;
-import javax.wsdl.extensions.soap.SOAPOperation;
-
-/**
- * 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 0e8161c..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/traversal/WSDLVisitor.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.wsdl.traversal;
-
-import javax.wsdl.Part;
-import javax.wsdl.Service;
-import javax.wsdl.Types;
-import javax.wsdl.Operation;
-import javax.wsdl.Input;
-import javax.wsdl.Output;
-import javax.wsdl.Fault;
-import javax.wsdl.Binding;
-import javax.wsdl.BindingOperation;
-import javax.wsdl.BindingInput;
-import javax.wsdl.BindingOutput;
-import javax.wsdl.BindingFault;
-import javax.wsdl.Import;
-import org.w3c.dom.Element;
-import javax.wsdl.Message;
-import javax.wsdl.Port;
-import javax.wsdl.PortType;
-import javax.wsdl.Definition;
-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;
-
-/**
- * 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 5509309..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/xsd/FileEntityResolver.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.wsdl.xsd;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-
-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.
- * 
- * @author Lawrence Mandel, IBM
- */
-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();
-    URL url = null;
-    if(systemId != null)
-    {
-      url = new URL(systemId);
-    }
-    else if(publicId != null)
-    {
-      url = new URL(publicId);
-    }
-    else if(namespace != null)
-    {
-      url = new URL(namespace);
-    }
-    if(url != null)
-    {
-      InputStream is = url.openStream();
-      return new XMLInputSource(publicId, resource.getExpandedSystemId(), resource.getExpandedSystemId(), 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 be19008..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/xsd/InlineSchemaGenerator.java
+++ /dev/null
@@ -1,591 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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 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 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 8759de5..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/xsd/InlineSchemaValidator.java
+++ /dev/null
@@ -1,242 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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;
-    
-    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.
-   * @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 1e3268b..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/xsd/InlineXSDResolver.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.wsdl.xsd;
-
-import java.io.IOException;
-import java.io.Reader;
-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;
-	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, 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/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 0f17a474..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/xsd/XSDValidator.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.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.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.
- * 
- * @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*/);
-        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
-        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 393e698..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/XMLDocumentCache.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.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
-{
-
-  /**
-	 * 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);
-  }
-
-  /**
-   * Constructor for XMLDocumentCache.
-   * @param initialCapacity  the initial capacity.
-   */
-  public XMLDocumentCache(int initialCapacity)
-  {
-    super(initialCapacity);
-  }
-
-  /**
-   * Constructor for XMLDocumentCache.
-   */
-  public XMLDocumentCache()
-  {
-    super();
-  }
-
-  /**
-   * Constructor for XMLDocumentCache.
-   * @param t  the map whose mappings are to be placed in this map.
-   */
-  public XMLDocumentCache(Map t)
-  {
-    super(t);
-  }
-
-}
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 5a00135..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/XMLDocumentCacheUser.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.xml;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.w3c.dom.Document;
-
-import java.net.URL;
-
-/**
- * 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
-{
-  /**
-   * Cache of parsed documents.
-   */
-  protected XMLDocumentCache documentList = null;
-
-  /**
-   * 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) documentList.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)
-  {
-    documentList.put(key, document);
-  }
-
-  /**
-   * Get document list.
-   * @return a XMLDocumentCache object representing the document list value.
-   */
-  public XMLDocumentCache getDocumentList()
-  {
-    return documentList;
-  }
-
-  /**
-   * 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 d51e460..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/XMLUtils.java
+++ /dev/null
@@ -1,1503 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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 {
-		Document document = null;
-
-		try
-		{
-			document = 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;
-
-		// 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(validate);
-
-		try
-		{
-			// 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);
-		}
-
-		// 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());   
-		  ClassLoader tempLoader = Thread.currentThread().getContextClassLoader();
-		
-		  // 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(validate);
-
-		  // 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(true);
-			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;
-		// 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(true);
-		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));
-
-		try
-		{
-			// 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);
-		}
-
-		// 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;
-
-		// 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(true);
-		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));
-		try
-		{
-			// 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);
-		}
-
-		// 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;
-
-		// 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(true);
-		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);
-
-		try
-		{
-			// 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);
-		}
-
-		// 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");
-
-		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]);
-			Document doc = 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 cb5f90e..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/XMLVisitor.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.xml;
-
-import org.w3c.dom.*;
-
-/**
- * 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 e62a06c..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/dom/DOMParser.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.xml.dom;
-
-import org.w3c.dom.Element;
-
-import org.xml.sax.SAXNotSupportedException;
-import org.xml.sax.SAXNotRecognizedException;
-
-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.XMLLocator;
-import org.apache.xerces.xni.XMLAttributes;
-import org.apache.xerces.xni.XNIException;
-
-/**
- * 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;
-
-      elementImpl.setUserData(
-        ElementLocation.KEY_NAME,
-        (ElementLocation)new ElementLocation(locator.getLineNumber(), locator.getColumnNumber()),
-        null);
-    }
-    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 00cc745..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/dom/ElementLocation.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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 6806cea..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/jaxp/DocumentBuilderFactoryImpl.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.xml.jaxp;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-import java.util.Hashtable;
-
-/**
- * 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)
- * @version 1.0.1
- */
-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 f 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);
-  }
-}
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 997606f..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/jaxp/DocumentBuilderImpl.java
+++ /dev/null
@@ -1,249 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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 org.apache.xerces.impl.Constants;
-import org.apache.xerces.dom.DocumentImpl;
-import org.apache.xerces.dom.DOMImplementationImpl;
-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;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-
-import java.io.IOException;
-import java.util.Hashtable;
-import java.util.Enumeration;
-
-/**
- * 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 b5c36fb..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/schema/TargetNamespaceProcessor.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.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.XMLDocumentCache;
-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,
-    XMLDocumentCache documentList)
-  {
-    super(context, documentList, 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
-  {
-    // 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;
-  }
-}
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 f88a390..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/schema/XMLSchemaProcessor.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.xml.schema;
-
-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.XMLDocumentCache;
-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;
-
-import java.util.List;
-import java.util.Vector;
-
-/**
- * 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, XMLDocumentCache documentList)
-  {
-    this(context, documentList, 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,
-    XMLDocumentCache documentList,
-    boolean throwException)
-  {
-    super();
-
-    this.context = context;
-    this.documentList = documentList;
-    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
-  {
-    // 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();
-    }
-
-    // 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 865e51c..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/schema/XMLSchemaValidator.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.xml.schema;
-
-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.XMLDocumentCache;
-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 com.ibm.wsdl.util.xml.DOM2Writer;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-/**
- * 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, XMLDocumentCache documentList)
-  {
-    super(context, documentList);
-  }
-
-  protected void processSchema(Element element)
-  {
-    NamedNodeMap attrList;
-    String elementPrefix = null;
-
-    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
-      Document doc =
-        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/URIEncoder.java b/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/URIEncoder.java
deleted file mode 100644
index a389ed1..0000000
--- a/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/URIEncoder.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- * Licensed Material - Property of IBM
- * (C) Copyright IBM Corp. 2002 - All Rights Reserved.
- * US Government Users Restricted Rights - Use, duplication or disclosure
- * restricted by GSA ADP Schedule Contract with IBM Corp.
- *
- * plugins/com.ibm.etools.xmlutility/src/com/ibm/etools/xmlutility/uri/URIEncoder.java, com.ibm.etools.xmlutility, wsa.xml.v51, 20030718_1605.o
- *
- * @version 1.3 7/18/03
- */
-
-package org.eclipse.wst.wsi.internal;
-
-import java.io.ByteArrayOutputStream;
-import java.io.BufferedWriter;
-import java.io.OutputStreamWriter;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.util.BitSet;
-
-/**
- *  This class is a modified version of java.lang.URLEncoder.
- */
-public class URIEncoder
-{
-  static BitSet dontNeedEncoding;
-  static final int caseDiff = ('a' - 'A');
-  static String dfltEncName = null;
-
-  static {
-    dontNeedEncoding = new BitSet(256);
-    int i;
-    for (i = 'a'; i <= 'z'; i++)
-    {
-      dontNeedEncoding.set(i);
-    }
-    for (i = 'A'; i <= 'Z'; i++)
-    {
-      dontNeedEncoding.set(i);
-    }
-    for (i = '0'; i <= '9'; i++)
-    {
-      dontNeedEncoding.set(i);
-    }
-
-    //dontNeedEncoding.set(' '); // cs.. removed so that space character will be replaced by %20
-    dontNeedEncoding.set('-');
-    dontNeedEncoding.set('_');
-    dontNeedEncoding.set('.');
-    dontNeedEncoding.set('*');
-    dontNeedEncoding.set(':'); // cs.. added 
-    dontNeedEncoding.set('/');
-    // cs.. added so that slashes don't get encoded as %2F
-
-    // dfltEncName = (String)AccessController.doPrivileged(new GetPropertyAction("file.encoding"));
-    // As discussed with Sandy, we should encode URIs with UTF8
-    dfltEncName = "UTF8";
-    //System.out.println("dfltEncName " + dfltEncName);
-  }
-
-  /**
-   * You can't call the constructor.
-   */
-  private URIEncoder()
-  {
-  }
-
-  /**
-   * Translates a string into <code>x-www-form-urlencoded</code>
-   * format. This method uses the platform's default encoding
-   * as the encoding scheme to obtain the bytes for unsafe characters.
-   *
-   * @param   s   <code>String</code> to be translated.
-   * @return  the translated <code>String</code>.
-   */
-  public static String encode(String s)
-  {
-    String str = null;
-    try
-    {
-      str = encode(s, dfltEncName);
-    }
-    catch (UnsupportedEncodingException e)
-    {
-      // The system should always have the platform default
-    }
-    return str;
-  }
-
-  /**
-   * Translates a string into <code>application/x-www-form-urlencoded</code>
-   * format using a specific encoding scheme. This method uses the
-   * supplied encoding scheme to obtain the bytes for unsafe
-   * characters.
-   * <p>
-   * <em><strong>Note:</strong> The <a href=
-   * "http://www.w3.org/TR/html40/appendix/notes.html#non-ascii-chars">
-   * World Wide Web Consortium Recommendation</a> states that
-   * UTF-8 should be used. Not doing so may introduce
-   * incompatibilites.</em>
-   *
-   * @param   s   <code>String</code> to be translated.
-   * @param   enc   The name of a supported 
-   *    <a href="../lang/package-summary.html#charenc">character
-   *    encoding</a>.
-   * @return  the translated <code>String</code>.
-   * @exception  UnsupportedEncodingException
-   *             If the named encoding is not supported
-   * @see URLDecoder#decode(java.lang.String, java.lang.String)
-   */
-  public static String encode(String s, String enc)
-    throws UnsupportedEncodingException
-  {
-    boolean needToChange = false;
-    boolean wroteUnencodedChar = false;
-    int maxBytesPerChar = 10; // rather arbitrary limit, but safe for now
-    StringBuffer out = new StringBuffer(s.length());
-    ByteArrayOutputStream buf = new ByteArrayOutputStream(maxBytesPerChar);
-    BufferedWriter writer =
-      new BufferedWriter(new OutputStreamWriter(buf, enc));
-
-    for (int i = 0; i < s.length(); i++)
-    {
-      int c = (int) s.charAt(i);
-      //System.out.println("Examining character: " + c);
-      if (dontNeedEncoding.get(c))
-      {
-        //if (c == ' ')
-        //{
-        //  c = '+';
-        //  needToChange = true;
-        //}
-        //System.out.println("Storing: " + c);
-        out.append((char) c);
-        wroteUnencodedChar = true;
-      }
-      else
-      {
-        // convert to external encoding before hex conversion
-        try
-        {
-          if (wroteUnencodedChar)
-          { // Fix for 4407610
-            writer = new BufferedWriter(new OutputStreamWriter(buf, enc));
-            wroteUnencodedChar = false;
-          }
-          writer.write(c);
-
-          // If this character represents the start of a Unicode
-          // surrogate pair, then pass in two characters. It's not
-          // clear what should be done if a bytes reserved in the 
-          // surrogate pairs range occurs outside of a legal
-          // surrogate pair. For now, just treat it as if it were 
-          // any other character.
-          // 
-          if (c >= 0xD800 && c <= 0xDBFF)
-          {
-            //  System.out.println(Integer.toHexString(c) + " is high surrogate");			      
-            if ((i + 1) < s.length())
-            {
-              int d = (int) s.charAt(i + 1);
-              // System.out.println("\tExamining " + Integer.toHexString(d));			      
-              if (d >= 0xDC00 && d <= 0xDFFF)
-              {
-                // System.out.println("\t" + Integer.toHexString(d) + " is low surrogate");				
-                writer.write(d);
-                i++;
-              }
-            }
-          }
-          writer.flush();
-        }
-        catch (IOException e)
-        {
-          buf.reset();
-          continue;
-        }
-        byte[] ba = buf.toByteArray();
-
-        for (int j = 0; j < ba.length; j++)
-        {
-          out.append('%');
-          char ch = Character.forDigit((ba[j] >> 4) & 0xF, 16);
-          // converting to use uppercase letter as part of
-          // the hex value if ch is a letter.
-          if (Character.isLetter(ch))
-          {
-            ch -= caseDiff;
-          }
-          out.append(ch);
-          ch = Character.forDigit(ba[j] & 0xF, 16);
-          if (Character.isLetter(ch))
-          {
-            ch -= caseDiff;
-          }
-          out.append(ch);
-        }
-        buf.reset();
-        needToChange = true;
-      }
-    }
-    return (needToChange ? out.toString() : s);
-  }
-}
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/WSITestToolsPlugin.java b/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/WSITestToolsPlugin.java
deleted file mode 100644
index 9b1e978..0000000
--- a/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/WSITestToolsPlugin.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;
-
-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());
-   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 74f9ce1..0000000
--- a/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/WSITestToolsProperties.java
+++ /dev/null
@@ -1,207 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.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.wsi.internal.core.util.WSIProperties;
-
-import org.eclipse.wst.ws.internal.ui.plugin.WSUIPlugin;
-import org.eclipse.wst.ws.internal.ui.wsi.preferences.PersistentWSIContext;
-
-/**
- * WS-I test tools property.
- * 
- * @author Lawrence Mandel, IBM
- *
- */
-
-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 = "common/profiles/SSBP10_BP11_TAD.xml";
-  public final static String AP_ASSERTION_FILE = "common/profiles/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";
-
-  /**
-   *  Constructor.
-   */
-  protected WSITestToolsProperties()
-  {
-    super();
-    // TODO Auto-generated constructor stub
-  }
-  
-  /**
-   * Set the schema location.
-   * @param dir the schema location.
-   */
-  public static void setInstallDir(String dir)
-  {
-    installURL = dir;
-  }
-  
-  /**
-   * 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"));
-    }
-    catch (UnsupportedEncodingException e)
-    {
-      schemaLocationProperties.setProperty(
-        "wsi.analyzer.xmlschema.schema",
-        URIEncoder.encode(schemaURL + "XMLSchema.xsd"));
-      schemaLocationProperties.setProperty(
-        "wsi.analyzer.wsdl.schema",
-        URIEncoder.encode(schemaURL + "wsdl11.xsd"));
-      schemaLocationProperties.setProperty(
-        "wsi.analyzer.soap.schema",
-        URIEncoder.encode(schemaURL + "soapEnvelope.xsd"));
-      schemaLocationProperties.setProperty(
-        "wsi.analyzer.wsdlsoap.schema",
-        URIEncoder.encode(schemaURL + "wsdlSoap.xsd"));
-    }
-    WSIProperties.setThreadLocalProperties(schemaLocationProperties);
-  }
-
- 
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.eclipse.wsdl.validate.wsi.CheckWSI#checkWSI(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(installURL + AP_ASSERTION_FILE);
-        preferences.setComplianceLevel(PersistentWSIContext.STOP_NON_WSI);
-      } 
-      else if (APcontext.projectWarnNonWSICompliances(project))
-      {
-      	preferences.setTADFile(installURL + AP_ASSERTION_FILE);
-        preferences.setComplianceLevel(PersistentWSIContext.WARN_NON_WSI);
-      }
-      else if (SSBPcontext.projectStopNonWSICompliances(project))
-      {
-      	preferences.setTADFile(installURL + SSBP_ASSERTION_FILE);
-        preferences.setComplianceLevel(PersistentWSIContext.STOP_NON_WSI);
-      }
-      else if (SSBPcontext.projectWarnNonWSICompliances(project))
-      {
-      	preferences.setTADFile(installURL + SSBP_ASSERTION_FILE);
-        preferences.setComplianceLevel(PersistentWSIContext.WARN_NON_WSI);
-      }
-      else
-      {
-      	preferences.setTADFile(installURL + 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(installURL + AP_ASSERTION_FILE);
-        preferences.setComplianceLevel(PersistentWSIContext.STOP_NON_WSI);
-      }
-      else if(APlevel.equals(PersistentWSIContext.WARN_NON_WSI))
-      {
-      	preferences.setTADFile(installURL + AP_ASSERTION_FILE);
-        preferences.setComplianceLevel(PersistentWSIContext.WARN_NON_WSI);
-     }
-     if(SSBPlevel.equals(PersistentWSIContext.STOP_NON_WSI))
-     {
-   	   preferences.setTADFile(installURL + SSBP_ASSERTION_FILE);
-       preferences.setComplianceLevel(PersistentWSIContext.STOP_NON_WSI);
-     }
-     else if(SSBPlevel.equals(PersistentWSIContext.WARN_NON_WSI))
-     {
-    	preferences.setTADFile(installURL + SSBP_ASSERTION_FILE);
-        preferences.setComplianceLevel(PersistentWSIContext.WARN_NON_WSI);
-     }
-     else
-     {
-      	preferences.setTADFile(installURL + DEFAULT_ASSERTION_FILE);
-        preferences.setComplianceLevel(PersistentWSIContext.IGNORE_NON_WSI);
-      }
-    }
-    return preferences;
-  }
-  
-  /**
-   * Remove file: and any slashes from the fileuri. 
-   * Eclipse's resolution mechanism needs to start with the drive.
-   */
-  private 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 653e318..0000000
--- a/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/analyzer/MessageAnalyzer.java
+++ /dev/null
@@ -1,325 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.wsi.internal.URIEncoder;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.WSIPreferences;
-import org.eclipse.wst.wsi.internal.WSITestToolsProperties;
-import org.eclipse.wst.wsi.internal.analyzer.WSIAnalyzerException;
-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.report.AssertionError;
-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;
-
-/**
- * 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 final String FILE = "file:";
-
-  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;
-
-    assertionwarnings = new Vector();
-    assertionerrors = new Vector();
-  	this.wsiPreferences = WSITestToolsProperties.checkWSIPreferences(filename);
-  }
-  
-  /**
-   * Constructor for MessageAnalyzer.
-   * @param filename log file name.
-   */
-  public MessageAnalyzer(String filename, WSIPreferences wsiPreferences)
-  {
-    this.filename = filename;
-
-    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);
-  	wsdlspecified = true;
-  	
-  	this.wsdlfile = wsdlfile;
-  	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;
-  	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
-    {
-	  WSITestToolsProperties.setLocal();
-	  
-	  if (wsiPreferences.getComplianceLevel() != WSITestToolsProperties.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));
-	      analyzerconfig.setTestAssertionsDocumentLocation(URIEncoder.encode(wsiPreferences.getTADFile()));
-		}
-        //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(WSITestToolsProperties.STOP_NON_WSI))
-                {
-                  TestAssertion ta = ar.getAssertion();
-                  if (ta.isEnabled())
-                  {
-                    Iterator errorMessages = ar.getFailureDetailList().iterator();
-                    String error = "";
-                    while (errorMessages.hasNext())
-                    {
-                      FailureDetailImpl fdi = (FailureDetailImpl)errorMessages.next();
-                      error = (String) fdi.getFailureMessage();
-
-                      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(),
-                        "WS-I Message ID " + entry.getReferenceID() + ":" + ta.getFailureMessage(),
-                        lineNumber,
-                        columnNumber));
-                    }
-                  }
-                }
-                else if (ar.getResult().equalsIgnoreCase(FAILED) && 
-                         wsiPreferences.getComplianceLevel().equals(WSITestToolsProperties.WARN_NON_WSI))
-                {
-                  TestAssertion ta = ar.getAssertion();
-                  if (ta.isEnabled())
-                  {
-                    Iterator errorMessages = ar.getFailureDetailList().iterator();
-                    String error = "";
-                    while (errorMessages.hasNext())
-                    {
-                      FailureDetailImpl fdi = (FailureDetailImpl)errorMessages.next();
-                      error = (String) fdi.getFailureMessage();
-
-                      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 5c6d408..0000000
--- a/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/analyzer/WSDLAnalyzer.java
+++ /dev/null
@@ -1,387 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.wsi.internal.URIEncoder;
-import org.eclipse.wst.wsi.internal.WSIPreferences;
-import org.eclipse.wst.wsi.internal.WSITestToolsProperties;
-import org.eclipse.wst.wsi.internal.analyzer.WSIAnalyzerException;
-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.report.AssertionError;
-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;
-
-/**
- * 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 final String FILE = "file://";
-
-  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);
-  	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();
-
-                      String error = "";
-                      while (errorMessages.hasNext())
-                      {
-                        FailureDetailImpl fdi = (FailureDetailImpl) errorMessages.next();
-                        error = (String) fdi.getFailureMessage();
-
-                        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();
-                      String error = "";
-                      while (errorMessages.hasNext())
-                      {
-                        FailureDetailImpl fdi = (FailureDetailImpl) errorMessages.next();
-                        error = (String) fdi.getFailureMessage();
-
-                        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(FILE + 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()));
-
-	 }
-      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)
-  {
-	try
-	{
-	  wsdlURI = URIEncoder.encode(filename, "UTF8");
-	}
-	catch (UnsupportedEncodingException uee)
-	{
-	  wsdlURI = URIEncoder.encode(filename);
-	}
-  	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 4d4074c..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.document.DocumentFactoryImpl;
-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;
-
-/**
- * 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 6466223..0000000
--- a/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/validate/wsdl/WSDLValidator.java
+++ /dev/null
@@ -1,370 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.WSITestToolsPlugin;
-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.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 WSI_PREFIX = "WS-I: ";
-  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(WSITestToolsPlugin.getPlugin().getInstallURL() + WSITestToolsProperties.AP_ASSERTION_FILE);
-	    wsdlAnalyzer = new WSDLAnalyzer(uri, preferences);
-	  }
-	  else if(withBasic)
-	  {
-	  	WSIPreferences preferences = new WSIPreferences();
-		preferences.setComplianceLevel(wsiLevel);	
-	    preferences.setTADFile(WSITestToolsPlugin.getPlugin().getInstallURL() + 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(
-          WSI_PREFIX + assertionerror.getErrorMessage(),
-          assertionerror.getLine(),
-          assertionerror.getColumn(),
-          valInfo.getFileURI());
-
-      }
-      else if (type == WARNING)
-      {
-        valInfo.addWarning(
-          WSI_PREFIX + 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/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/build.properties b/tests/org.eclipse.wst.wsdl.tests.performance/build.properties
deleted file mode 100644
index 7f4b0f7..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/
-src.includes = data/,\
-               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 0e42e53..0000000
--- a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/AllTests.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 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(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/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 471912f..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.editor.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/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/plugin.xml b/tests/org.eclipse.wst.wsdl.tests.performance/plugin.xml
deleted file mode 100644
index ec3dd74..0000000
--- a/tests/org.eclipse.wst.wsdl.tests.performance/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.performance"
-   name="WSDL Performance Plug-in"
-   version="1.0.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.ui"/>
-      <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.test.performance"/>
-      <import plugin="org.eclipse.wst.wsdl"/>
-   </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 ea03944..0000000
--- a/tests/org.eclipse.wst.wsdl.tests.performance/test.xml
+++ /dev/null
@@ -1,65 +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="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">
-
-    <delete dir="${workspace}" quiet="true"/>
-    <ant target="core-test" antfile="${library-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>
-
-    <delete dir="${workspace}" quiet="true"/>
-    <ant target="ui-test" antfile="${library-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="${library-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 065ac06..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.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<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 ba077a4..0000000
--- a/tests/org.eclipse.wst.wsdl.tests.ui/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
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 ef988d7..0000000
--- a/tests/org.eclipse.wst.wsdl.tests.ui/.project
+++ /dev/null
@@ -1,45 +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>
-		<buildCommand>
-			<name>com.ibm.etools.validation.validationbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.ibm.sse.model.structuredbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.sse.core.structuredbuilder</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/build.properties b/tests/org.eclipse.wst.wsdl.tests.ui/build.properties
deleted file mode 100644
index c70f114..0000000
--- a/tests/org.eclipse.wst.wsdl.tests.ui/build.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-source.wsdl.tests.ui.jar = src/
-bin.includes = plugin.xml,\
-               *.jar,\
-               wsdl.tests.ui.jar,\
-               TemperatureService.wsdl,\
-               jars/
-src.includes = src/,\
-               plugin.xml,\
-               build.properties,\
-               TemperatureService.wsdl,\
-               .project,\
-               .classpath,\
-               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 24ad0a8..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="1.0.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 065ac06..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.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<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 ba077a4..0000000
--- a/tests/org.eclipse.wst.wsdl.tests/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/tests/org.eclipse.wst.wsdl.tests/.project b/tests/org.eclipse.wst.wsdl.tests/.project
deleted file mode 100644
index ee31d8f..0000000
--- a/tests/org.eclipse.wst.wsdl.tests/.project
+++ /dev/null
@@ -1,42 +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>
-		<buildCommand>
-			<name>org.eclipse.wst.sse.core.structuredbuilder</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/build.properties b/tests/org.eclipse.wst.wsdl.tests/build.properties
deleted file mode 100644
index 29d8417..0000000
--- a/tests/org.eclipse.wst.wsdl.tests/build.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-bin.includes = plugin.xml,\
-               test.xml,\
-               .options,\
-               testResources/,\
-               runtests.bat,\
-               JUNIT.XSL,\
-               runtime/,\
-               wsdl.tests.jar,\
-               samples/
-source.wsdl.tests.jar = src/
-src.includes = test.xml,\
-               src/,\
-               plugin.xml,\
-               build.xml,\
-               build.properties,\
-               .options,\
-               .classpath,\
-               .cvsignore,\
-               .project,\
-               JUNIT.XSL,\
-               runtests.bat,\
-               testResources/,\
-               runtime/,\
-               PTATimeDistribution.wsdl,\
-               TDDataSet.xsd,\
-               samples/
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 2af75f4..0000000
--- a/tests/org.eclipse.wst.wsdl.tests/plugin.xml
+++ /dev/null
@@ -1,24 +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="1.0.0">
-
-   <runtime>
-      <library name="wsdl.tests.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-
-   <requires>
-      <import plugin="org.eclipse.core.runtime.compatibility"/>
-      <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.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 5e582b1..0000000
--- a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/InlineSchemaTest.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.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.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.XSDTypeDefinition;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-import org.eclipse.xsd.util.XSDResourceFactoryImpl;
-import org.xml.sax.InputSource;
-
-/**
- * @author Kihup Boo
- */
-public class InlineSchemaTest extends TestCase 
-{
-  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("./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);
-      
-    // 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 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("./PTATimeDistribution.wsdl");
-  }
-  
-  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 cca5fd4..0000000
--- a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/LoadAndSerializationTest.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.tests;
-
-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.tests.util.DefinitionLoader;
-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 LoadAndSerializationTest extends TestCase
-{    
-  /**
-   * 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());
-  }
-  
-  /**
-   * Creates an instance.
-   */
-  public LoadAndSerializationTest(String name) 
-  {
-    super(name);
-  }
-  
-  public static Test suite() 
-  {
-    TestSuite suite = new TestSuite();
-    
-    suite.addTest
-      (new LoadAndSerializationTest("Load") 
-         {
-           protected void runTest() 
-           {
-             testLoad();
-           }
-         }
-       );
-    
-    suite.addTest
-      (new LoadAndSerializationTest("Print") 
-        {
-          protected void runTest() 
-          {
-            testPrint();
-          }
-        }
-      );
-    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;
-  
-  /**
-   * Load the WSDL definitions file and print information about it.
-   */
-  public void testLoad()
-  {
-    try
-    {
-      definition = DefinitionLoader.load("./samples/LoadAndPrintTest.wsdl");
-      Assert.assertTrue(definition.eResource() instanceof WSDLResourceImpl);
-      WSDLResourceImpl wsdlResource = (WSDLResourceImpl)definition.eResource();
-      System.out.println("<!-- ===== Definition Composition =====");
-      printDefinitionStart(definition);
-      System.out.println("-->");
-      Element element = definition.getElement();
-      Assert.assertNotNull(definition.getElement());
-      if (element != null)
-      {
-        // Print the serialization of the model.
-        //
-        WSDLResourceImpl.serialize(System.out, element);
-      }
-    }
-    catch (Exception e)
-    {
-      Assert.fail("Test failed due to an exception: " + e.getLocalizedMessage());
-    }  
-  }
-  
-  public void testPrint()
-  {
-    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();
-      System.out.println("<!-- [ definitions: " + definition.getQName() + " ] -->");
-      WSDLResourceImpl.serialize(System.out, definition.getDocument());
-    }
-    catch (Exception e)
-    {
-      Assert.fail("Test failed due to an exception: " + e.getLocalizedMessage());
-    }   
-  }
-  
-  /**
-   * Prints a header tag for the given WSDL definitions.
-   * @param definition a WSDL definition.
-   */
-  protected void printDefinitionStart(Definition definition)
-  {
-    System.out.print("<definitions name=\"");
-    if (definition.getQName() != null)
-    {
-      System.out.print(definition.getQName().getLocalPart());
-    }
-    
-    System.out.print("\" targetNamespace=\"");
-    if (definition.getTargetNamespace() != null)
-    {
-      System.out.print(definition.getTargetNamespace());
-    }       
-    System.out.println("\">");
-  }
-    
-}
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 97d3533..0000000
--- a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/SemanticTest.java
+++ /dev/null
@@ -1,494 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.*;
-
-import org.eclipse.wst.wsdl.tests.util.DefinitionLoader;
-import org.eclipse.wst.wsdl.tests.util.DefinitionVisitor;
-
-import org.eclipse.wst.wsdl.binding.soap.*;
-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.Element;
-
-/**
- * @author Kihup Boo
- */
-public class SemanticTest extends DefinitionVisitor
-{
-  
-  //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("./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 aeadd33..0000000
--- a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/UtilTest.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 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.internal.extensibility.ExtensibilityElementFactoryRegistryImpl;
-//import org.eclipse.wst.wsdl.internal.extensibility.ExtensibilityElementFactoryRegistryReader;
-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;
-
-import com.ibm.wsdl.extensions.soap.SOAPConstants;
-
-import junit.framework.Assert;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-public class UtilTest extends TestCase {
-
-	  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("./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("./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);
-		  }
-		}
-		catch (Exception e)
-		{
-		  Assert.fail("Test failed due to an exception: " + e.getLocalizedMessage());
-		}   
-	  }
-	  
-	  public void testExtensibilityElementFactory()
-	  {
-	    try
-	    {
-		    ExtensibilityElementFactory factory = WSDLPlugin.INSTANCE.getExtensibilityElementFactory(SOAPConstants.NS_URI_SOAP);
-		    if (factory != null)
-			{
-		      ExtensibilityElement ee = factory.createExtensibilityElement(SOAPConstants.NS_URI_SOAP, SOAPConstants.ELEM_BODY);
-              Assert.assertTrue("Problem creating SOAP extensibility element", ee != null);
-			}
-	    }
-		catch (Exception e)
-		{
-		  Assert.fail("Test failed due to an exception: " + e.getLocalizedMessage());
-		}   
-	  }
-	  
-	  public void testExtensibilityElementFactoryRegistry()
-	  {
-	    try
-	    {
-	    }
-		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 9fe6076..0000000
--- a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/WSDL4JAPITest.java
+++ /dev/null
@@ -1,430 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.Message;
-import javax.wsdl.OperationType;
-import javax.wsdl.Part;
-import javax.wsdl.xml.WSDLReader;
-import javax.xml.namespace.QName;
-import javax.wsdl.factory.WSDLFactory;
-
-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.internal.util.WSDLResourceFactoryImpl;
-import org.eclipse.wst.wsdl.tests.util.WSDL4JDefinitionVisitor;
-
-import org.eclipse.wst.wsdl.WSDLPlugin;
-import org.eclipse.wst.wsdl.WSDLPackage;
-
-import javax.wsdl.*;
-import javax.wsdl.extensions.soap.*;
-import javax.wsdl.extensions.*;
-
-import org.eclipse.xsd.XSDPackage;
-import org.eclipse.xsd.XSDSchema;
-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); // TBD - serialize 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);
-  }
- 
-  //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 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();
-    }
-    catch (Exception e)
-    {
-      e.printStackTrace();
-      Assert.fail(e.toString());
-    }    
-  }
-  
-  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();
-    Definition definition = (org.eclipse.wst.wsdl.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 0d7ceb4..0000000
--- a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/WSDLEMFAPITest.java
+++ /dev/null
@@ -1,489 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.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.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.Namespace;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.WSDLFactory;
-import org.eclipse.wst.wsdl.WSDLPackage;
-
-import org.eclipse.wst.wsdl.binding.soap.*;
-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.util.XSDResourceFactoryImpl;
-import org.w3c.dom.Element;
-
-/**
- * @author Kihup Boo
- */
-public class WSDLEMFAPITest extends DefinitionVisitor
-{
-  private WSDLFactory factory = WSDLFactory.eINSTANCE;
-  
-  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 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());
-    
-    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);
-    }
-    
-    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;
-    while (iterator.hasNext())
-    {
-      ee = (ExtensibilityElement)iterator.next();
-      myTypes.addExtensibilityElement(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());
-    
-    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.getEParts().add(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);
-  }
-  
-  protected void visitInput(Input input)
-  {
-    Input myInput = factory.createInput();
-    myInput.setDocumentationElement(input.getDocumentationElement());    
-    myInput.setName(input.getName());
-    myInput.setEMessage(input.getEMessage());
-    myInput.setEnclosingDefinition(newDefinition);
-    currentOperation.setEInput(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());
-
-    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);
-    
-    super.visitBindingOperation(bindingOperation);
-  }
- 
-  protected void visitBindingInput(BindingInput input)
-  {
-    BindingInput myInput = factory.createBindingInput();
-    myInput.setDocumentationElement(input.getDocumentationElement());    
-    myInput.setName(input.getName());
-    currentBindingOperation.setEBindingInput(myInput);
-    
-    super.visitBindingInput(input);
-  }
-  
-  protected void visitBindingOutput(BindingOutput output)
-  {
-    BindingOutput myOutput = factory.createBindingOutput();
-    myOutput.setDocumentationElement(output.getDocumentationElement());   
-    myOutput.setName(output.getName());
-    currentBindingOperation.setEBindingOutput(myOutput);
-    
-    super.visitBindingOutput(output);
-  }
-  
-  protected void visitBindingFault(BindingFault fault)
-  {
-    BindingFault myFault = factory.createBindingFault();
-    myFault.setDocumentationElement(fault.getDocumentationElement());   
-    myFault.setName(fault.getName());
-    currentBindingOperation.getEBindingFaults().add(myFault);
-    
-    super.visitBindingFault(fault); 
-  }
- 
-  protected void visitService(Service service)
-  {
-    currentService = factory.createService();
-    currentService.setDocumentationElement(service.getDocumentationElement());   
-    currentService.setQName(service.getQName());
-    
-    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);
-    
-    super.visitPort(port);
-  }
-
-  protected void visitExtensibilityElement(ExtensibleElement owner, 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);
-    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 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("./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/WSDLGenerationTest.java b/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/WSDLGenerationTest.java
deleted file mode 100644
index b510130..0000000
--- a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/WSDLGenerationTest.java
+++ /dev/null
@@ -1,245 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.*;
-import org.eclipse.wst.wsdl.tests.util.DefinitionLoader;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-
-import org.eclipse.wst.wsdl.binding.soap.*;
-import org.eclipse.wst.wsdl.binding.soap.internal.util.*;
-import org.eclipse.wst.wsdl.internal.util.WSDLResourceFactoryImpl;
-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/util/DefinitionLoader.java b/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/DefinitionLoader.java
deleted file mode 100644
index 34cb295..0000000
--- a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/DefinitionLoader.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.wsdl.tests.util;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-import java.util.Hashtable;
-import java.util.Iterator;
-
-import org.eclipse.core.runtime.IPluginDescriptor;
-import org.eclipse.core.runtime.Platform;
-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.*;
-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
-  {
-    URI uri;
-    File file = new File(filename);
-    if (file.isFile())
-      uri = URI.createFileURI(file.getCanonicalFile().toString());
-    else
-    { // Assume that this is run as a JUnit Plug-in test.
-      //uri = URI.createURI(filename);
-      IPluginDescriptor pd = Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.wst.wsdl.tests");
-      URL url = pd.getInstallURL();
-      url = new URL(url,filename);
-      String s = Platform.resolve(url).getFile();
-      uri = URI.createFileURI(s);
-    }
-  
-    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
-  {
-    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 a814113..0000000
--- a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/DefinitionVisitor.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.wst.wsdl.*;
-import java.util.*;
-
-import junit.framework.TestCase;
-
-/**
- * @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 b529c8d..0000000
--- a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/WSDL4JDefinitionVisitor.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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 javax.wsdl.*;
-import javax.wsdl.extensions.*;
-
-import java.util.*;
-
-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 dc15e94..0000000
--- a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/WSDLConverter.java
+++ /dev/null
@@ -1,609 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.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;
-
-import javax.wsdl.OperationType;
-
-/**
- * @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 26dac15..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.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/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 d5b8c19..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.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 065ac06..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.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<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 ba077a4..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
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 d10956b..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/.project
+++ /dev/null
@@ -1,33 +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>
-		<buildCommand>
-			<name>com.ibm.sse.model.structuredbuilder</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 bb5d648..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,16 +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: 1.0.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.jdt.core,
- org.eclipse.wst.wsdl.validation
-Eclipse-AutoStart: true
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 b0a6877..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/build.properties
+++ /dev/null
@@ -1,9 +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/
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 1ca1722..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/internal/resolver/URIResolverTest.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.resolver;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * @author lmandel
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-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.", uriResolver.resolve(baseLocation, null, systemId), systemId);
-  	
-  }
-  
-  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.", uriResolver.resolve(baseLocation, null, systemId), "file:/c:/somepath/somepath/myfile.txt");
-  }
-  
-  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.", uriResolver.resolve(baseLocation, null, systemId), "file:/c:/somepath/myfile.txt");
-  }
-  
-  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.", uriResolver.resolve(baseLocation, null, systemId), "file:/c:/myfile.txt");
-  }
-  
-  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.", uriResolver.resolve(baseLocation, null, systemId), "file:/c:/somepath/somepath/myfile.txt");
-  }
-  
-  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.", uriResolver.resolve(baseLocation, null, systemId), "file:/c:/somepath/somepath/myfile.txt");
-  }
-  
-  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.", uriResolver.resolve(baseLocation, null, systemId), "file:/c:/somepath/somepath/myfile.txt");
-  }
-  
-  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.", uriResolver.resolve(baseLocation, null, systemId), "file:/c:/somepath/somepath/myfile.txt");
-  }
-  
-  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.", uriResolver.resolve(baseLocation, null, systemId), "file:/c:/somepath/somepath/somepath/myfile.txt");
-  }
-  
-  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.", uriResolver.resolve(baseLocation, null, systemId), "file:/c:/somepath/myfile.txt");
-  }
-  
-  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.", uriResolver.resolve(baseLocation, null, systemId), "file:/c:/somepath/somepath/myfile.txt");
-  }
-  
-  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.", uriResolver.resolve(baseLocation, null, systemId), "file:/../somepath/myfile.txt");
-  }
-  
-  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.", uriResolver.resolve(baseLocation, null, systemId), "file:/somepath/myfile.txt");
-  }
-  
-  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.", uriResolver.resolve(baseLocation, null, systemId), "file:../somepath/myfile.txt");
-  }
-  
-  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.", uriResolver.resolve(baseLocation, null, systemId), "file:somepath/myfile.txt");
-  }
-  
-  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.", uriResolver.resolve(baseLocation, null, systemId), "file:/somepath/somedir../myfile.txt");
-  }
-  
-  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.", uriResolver.resolve(baseLocation, null, systemId), "file:/somepath/somedir./myfile.txt");
-  }
-  
-  public void testNormalizeNullSystemId()
-  {
-    // System id is null
-  	String baseLocation = "file:/somepath/file.txt";
-  	String systemId = null;
-  	assertEquals("systemId is null.", uriResolver.resolve(baseLocation, null, systemId), null);
-  }
-  
-  public void testNormalizeNullBaseLocation()
-  {
-    // Base location is null
-  	String baseLocation = null;
-  	String systemId = "somedir./myfile.txt";
-  	assertEquals("systemId is null.", uriResolver.resolve(baseLocation, null, systemId), null);
-  }
-  
-  public void testNormalizeSystemIdAbsoluteNullBaseLocation()
-  {
-    // Base location is null
-  	String baseLocation = "null";
-  	String systemId = "file:/somedir./myfile.txt";
-  	assertEquals("systemId is null.", uriResolver.resolve(baseLocation, null, systemId), "file:/somedir./myfile.txt");
-  }
-
-	
-}
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 06bc24c..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/tests/internal/AllWSDLTests.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.tests.internal;
-import junit.framework.Test;
-
-import org.eclipse.wst.wsdl.validation.internal.resolver.URIResolverTest;
-/**
- * The root test suite that contains all other WSDL validator test suites.
- * 
- * @author Lawrence Mandel, IBM
- */
-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());
-  }
-}
\ 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 5458530..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/tests/internal/BaseTestCase.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.validation.tests.internal;
-
-import java.io.BufferedReader;
-import java.io.DataOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.Reader;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.internal.resources.ProjectDescription;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-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
- * 
- * @author Lawrence Mandel, IBM
- */
-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.getPluginLocation();
-    
-    // Set the WS-I preference to ignore so only WSDL errors will be tested.
-	// TODO: Re-enable this WS-I disablement code once WS preference plugin is moved to WST.
-    //WebServiceUIPlugin wsui = WebServiceUIPlugin.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, "'" + PLUGIN_NAME);
-         message = message.replaceAll("[(][^(]*" + PLUGIN_NAME, "[(]" + 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, "'" + PLUGIN_NAME);
-         message = message.replaceAll("[(][^(]*" + PLUGIN_NAME, "(" + 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, "'" + PLUGIN_NAME);
-        message = message.replaceAll("[(][^(]*" + PLUGIN_NAME, "[(]" + PLUGIN_NAME);
-        messageString += ("-> " + message + " [" + nesvalmes.getLine() +", " + nesvalmes.getColumn() +"]\n");
-        messageString += createNestedMessageString(nesvalmes.getNestedMessages(), depth + 1);
-      }
-      return messageString;
-    }
-    else
-    {
-      return "";
-    }
-  }
-  
-  protected IProject createProject(String projectName, String[] files, String[] projectNatures, IProject[] referencedProjects)
-  {
-    final IWorkspace workspace = ResourcesPlugin.getWorkspace();
-    final IProject project = workspace.getRoot().getProject(projectName);
-    if(!project.exists())
-    {
-      try
-	  {
-        project.create(null);
-      }
-      catch(CoreException e)
-	  {
-        fail("Could not create project " + projectName + e);
-      } 
-    }
-    if(!project.isOpen())
-    {
-      try
-	  {
-        project.open(null);
-	  }
-      catch(CoreException e)
-      {
-        fail("Could not open project " + projectName + e);
-	  }
-    }
-    try
-    {
-      IProjectDescription projectDescription = new ProjectDescription();
-      projectDescription.setName(projectName);
-      projectDescription.setNatureIds(projectNatures);
-      if(referencedProjects!=null)
-      {
-        projectDescription.setReferencedProjects(referencedProjects);
-      }
-      project.setDescription(projectDescription, null);
-    }
-    catch(Exception e)
-    {
-      fail("Unable to set project properties for project " + projectName + ". " + e);
-    }
-   IJavaProject javaProject = JavaCore.create(project);
-   try
-   {
-     javaProject.open(null);
-     List entries = new ArrayList();
-     entries.add(JavaCore.newSourceEntry(new Path("default")));
-     
-     if(referencedProjects != null)
-     {
-       for(int i = 0; i < referencedProjects.length; i++)
-       {
-         entries.add(JavaCore.newProjectEntry(referencedProjects[i].getLocation()));
-       }
-     }
-     javaProject.setRawClasspath((IClasspathEntry[])entries.toArray(new IClasspathEntry[entries.size()]), null);
-   }
-   catch(Exception e)
-   {
-     fail("Can't open Java project: " + e);
-   }
-
-    if(files != null)
-    {
-      int numfiles = files.length;
-      for(int i = 0; i < numfiles; i++)
-      {
-        try
-		{
-          File file = new File(files[i]);
-          FileInputStream in = new FileInputStream(file);
-          IFile iFile = project.getFile(file.getName());
-          if(!iFile.exists())
-          {
-            iFile.create(in, true, null);
-            in.close();
-          }
-		}
-        catch(Exception e)
-		{
-		  fail("Unable to locate file " + files[i]);
-		} 
-      }
-    }
-    return project;
-  }
-}
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 7483637..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/tests/internal/PathsTest.java
+++ /dev/null
@@ -1,571 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.
- * 
- * @author Lawrence Mandel, IBM
- */
-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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 959ce89..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/tests/internal/WSDLTest.java
+++ /dev/null
@@ -1,368 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.
- * 
- * @author Lawrence Mandel, IBM
- */
-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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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/ImportingUsingClasspath.wsdl
-   */
-//  public void testImportingUsingClasspath()
-//  {
-//    final IWorkspace workspace = ResourcesPlugin.getWorkspace();
-//    String testname = "ImportingUsingClasspath";
-//    String importingfile = PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + WSDL_DIR + "Import/" + "ImportingUsingClasspath.wsdl";
-//    importingfile = importingfile.replace('/','\\');
-//    importingfile = importingfile.substring(5);
-//    String importedfile = PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + WSDL_DIR + "Import/" + "ImportedUsingClasspath.wsdl";
-//    importedfile = importedfile.replace('/','\\');
-//    importedfile = importedfile.substring(5);
-//    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";
-//    
-//    String projectName = "Project1";
-//    String projectName2 = "Project2";
-//    // Create a simple project for ImportedSchemaWithSchemaImport test.
-//    IProject project2 = createProject(projectName2, new String[]{importedfile},new String[]{"org.eclipse.jdt.core.javanature", "com.ibm.wtp.jca.ConnectorNature"}, null);
-//    IProject project1 = createProject(projectName, new String[]{importingfile},new String[]{"org.eclipse.jdt.core.javanature", "com.ibm.wtp.jca.ConnectorNature"}, new IProject[]{project2});
-//    
-//    String testfile = "file:/" + project1.getFile("ImportingUsingClasspath.wsdl").getLocation().toString();
-//    runTest(testfile, loglocation, idealloglocation);
-//    
-//    try
-//    {
-//      project1.delete(true, true, null);
-//      project2.delete(true, true, null);
-//    }
-//    catch(Exception e)
-//    {
-//    }
-//  }
-  
-  /**
-   * Test /WSDL/Import/AlphabeticalOrderOfImports/ImportOneAndTwo.wsdl
-   */
-  public void testImportOneAndTwo()
-  {
-    String testname = "ImportOneAndTwo";
-    String testfile = 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 = 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 = 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);
-  }
-  
-  /**
-   * CYCLIC TESTS
-   */
-  
-  /**
-   * Test /WSDL/Cyclic/PorttypeRefMessage1.wsdl
-   */
-  public void testPorttypeRefMessage1()
-  {
-    String testname = "PorttypeRefMessage1";
-    String testfile = 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 = 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 = 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 = 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 = 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 = 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 = 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);
-  }
-}
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 87cdc74..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/tests/internal/WSDLValidatorTestsPlugin.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.validation.tests.internal;
-
-import java.io.IOException;
-import java.net.URL;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class to be used in the desktop.
- * 
- * @author Lawrence Mandel, IBM
- */
-public class WSDLValidatorTestsPlugin extends AbstractUIPlugin
-{
-  //The shared instance.
-  private static WSDLValidatorTestsPlugin plugin;
-
-  //Resource bundle.
-  private ResourceBundle resourceBundle;
-
-  /**
-   * The constructor.
-   */
-  public WSDLValidatorTestsPlugin()
-  {
-    super();
-    plugin = this;
-//    try
-//    {
-//      resourceBundle = ResourceBundle.getBundle("org.eclipse.wsdl.validate.tests.WSDLValidatorTestsPluginResources");
-//    }
-//    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 WSDLValidatorTestsPlugin 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 = WSDLValidatorTestsPlugin.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;
-  }
-
-  /**
-   * Return the location of this plugin (ie. where this plugin is installed.)
-   * 
-   * @return The location of this plugin.
-   */
-  public static String getPluginLocation()
-  {
-    try
-    {
-      URL location = Platform.resolve(getDefault().find(new Path("")));
-      return location.toExternalForm();
-    }
-    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 4d47801..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/tests/internal/XSDTest.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.validation.tests.internal;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-/**
- * XSD validation tests for the WSDL validator.
- * 
- * @author Lawrence Mandel, IBM
- */
-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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 a730ea8..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/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/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/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 f2e2d17..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 imported document's target namespace 'http://www.example.com'. [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 9719f10..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 imported document's target namespace 'http://tempuri.org/simplewsdl/'. [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 940f9f7..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 (org.eclipse.wst.wsdl.validation.tests/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/ImportingUsingClasspath.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportingUsingClasspath.wsdl-log
deleted file mode 100644
index aa2b361..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportingUsingClasspath.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/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/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/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/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 b05b610..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 'org.eclipse.wst.wsdl.validation.tests/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 'org.eclipse.wst.wsdl.validation.tests/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/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/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/ImportedUsingClasspath.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportedUsingClasspath.wsdl
deleted file mode 100644
index 51e5655..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportedUsingClasspath.wsdl
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:tns="http://tempuri.org/ImportedUsingClasspath/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="ImportedUsingClasspath" targetNamespace="http://tempuri.org/ImportedUsingClasspath/">
-	<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/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/ImportingUsingClasspath.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportingUsingClasspath.wsdl
deleted file mode 100644
index a1f5989..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportingUsingClasspath.wsdl
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:tns="http://tempuri.org/ImportingUsingClasspath/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="ImportingUsingClasspath" targetNamespace="http://tempuri.org/ImportingUsingClasspath/" xmlns:classpath="http://tempuri.org/ImportedUsingClasspath/">
-	<wsdl:import namespace="http://tempuri.org/ImportedUsingClasspath/" location="ImportedUsingClasspath.wsdl"></wsdl:import>
-    <wsdl:portType name="portType">
-      <wsdl:operation name="operation">
-        <wsdl:input message="classpath:message"></wsdl:input>
-        <wsdl:output message="classpath:message"></wsdl:output>
-      </wsdl:operation>
-    </wsdl:portType>
-</wsdl:definitions>
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/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/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/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>